From dc3e3bf6f21327c1d88d436396d578b274ade7d4 Mon Sep 17 00:00:00 2001 From: Wangjiahao <1522128093@qq.com> Date: Wed, 14 Jun 2023 18:22:36 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=8B=BC=E5=86=99=E7=BA=A0=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataease/commons/pool/PriorityThreadPoolExecutor.java | 4 ++-- .../main/java/io/dataease/plugins/server/XDeptServer.java | 4 ++-- .../main/java/io/dataease/service/panel/ShareService.java | 8 ++++---- frontend/src/lang/en.js | 2 +- frontend/src/lang/tw.js | 2 +- frontend/src/lang/zh.js | 2 +- .../src/views/dataset/data/components/filterFiled.vue | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/backend/src/main/java/io/dataease/commons/pool/PriorityThreadPoolExecutor.java b/backend/src/main/java/io/dataease/commons/pool/PriorityThreadPoolExecutor.java index d55d9e8a65..445cca65a8 100644 --- a/backend/src/main/java/io/dataease/commons/pool/PriorityThreadPoolExecutor.java +++ b/backend/src/main/java/io/dataease/commons/pool/PriorityThreadPoolExecutor.java @@ -8,7 +8,7 @@ import io.dataease.commons.utils.LogUtil; public class PriorityThreadPoolExecutor extends ThreadPoolExecutor { - public static AtomicInteger globaInteger = new AtomicInteger(1); + public static AtomicInteger globalInteger = new AtomicInteger(1); private ThreadLocal local = new ThreadLocal() { @Override @@ -42,7 +42,7 @@ public class PriorityThreadPoolExecutor extends ThreadPoolExecutor { @Override public void execute(Runnable command) { - int andIncrement = globaInteger.getAndIncrement(); + int andIncrement = globalInteger.getAndIncrement(); Integer theadInteger = local.get(); try { if (theadInteger == 0) { diff --git a/backend/src/main/java/io/dataease/plugins/server/XDeptServer.java b/backend/src/main/java/io/dataease/plugins/server/XDeptServer.java index 772fafdaef..b5ad29898a 100644 --- a/backend/src/main/java/io/dataease/plugins/server/XDeptServer.java +++ b/backend/src/main/java/io/dataease/plugins/server/XDeptServer.java @@ -66,8 +66,8 @@ public class XDeptServer { @PostMapping("/search") public List search(@RequestBody XpackGridRequest request){ DeptXpackService deptService = SpringContextUtil.getBean(DeptXpackService.class); - List ndoes = deptService.nodesTreeByCondition(request); - List nodeResponses = ndoes.stream().map(node -> { + List nodes = deptService.nodesTreeByCondition(request); + List nodeResponses = nodes.stream().map(node -> { DeptNodeResponse deptNodeResponse = BeanUtils.copyBean(new DeptNodeResponse(), node); deptNodeResponse.setHasChildren(node.getSubCount() > 0); deptNodeResponse.setLeaf(node.getSubCount() == 0); diff --git a/backend/src/main/java/io/dataease/service/panel/ShareService.java b/backend/src/main/java/io/dataease/service/panel/ShareService.java index f11ba695a0..536f174528 100644 --- a/backend/src/main/java/io/dataease/service/panel/ShareService.java +++ b/backend/src/main/java/io/dataease/service/panel/ShareService.java @@ -398,8 +398,8 @@ public class ShareService { return; } panelShareOutDTOS.forEach(shareOut -> { - SysLogConstants.SOURCE_TYPE buiType = buiType(shareOut.getType()); - DeLogUtils.save(SysLogConstants.OPERATE_TYPE.UNSHARE, SysLogConstants.SOURCE_TYPE.PANEL, panelId, panelGroup.getPid(), shareOut.getTargetId(), buiType); + SysLogConstants.SOURCE_TYPE busiType = busiType(shareOut.getType()); + DeLogUtils.save(SysLogConstants.OPERATE_TYPE.UNSHARE, SysLogConstants.SOURCE_TYPE.PANEL, panelId, panelGroup.getPid(), shareOut.getTargetId(), busiType); }); Map> listMap = panelShareOutDTOS.stream().collect(Collectors.groupingBy(dto -> dto.getType())); @@ -426,7 +426,7 @@ public class ShareService { } } - private SysLogConstants.SOURCE_TYPE buiType(Integer type) { + private SysLogConstants.SOURCE_TYPE busiType(Integer type) { SysLogConstants.SOURCE_TYPE targetType = SysLogConstants.SOURCE_TYPE.USER; if (type == 1) { targetType = SysLogConstants.SOURCE_TYPE.ROLE; @@ -443,7 +443,7 @@ public class ShareService { extPanelShareMapper.removeShares(removeRequest); - SysLogConstants.SOURCE_TYPE targetType = buiType(removeRequest.getType()); + SysLogConstants.SOURCE_TYPE targetType = busiType(removeRequest.getType()); DeLogUtils.save(SysLogConstants.OPERATE_TYPE.UNSHARE, SysLogConstants.SOURCE_TYPE.PANEL, panelId, panelGroup.getPid(), removeRequest.getTargetId(), targetType); diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js index a0325236d8..7825c1cb37 100644 --- a/frontend/src/lang/en.js +++ b/frontend/src/lang/en.js @@ -2451,7 +2451,7 @@ export default { add_condition: 'Add condition', add_relationship: 'Add relationship', filter_fields: 'Filter fields', - selct_filter_fields: 'Please select a filter field', + select_filter_fields: 'Please select a filter field', enter_keywords: 'Please enter keywords', screen_method: 'Screening method', select: 'Please select', diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js index d1e027a919..64b8917d15 100644 --- a/frontend/src/lang/tw.js +++ b/frontend/src/lang/tw.js @@ -2445,7 +2445,7 @@ export default { add_condition: '添加條件', add_relationship: '添加關系', filter_fields: '篩選字段', - selct_filter_fields: '請選擇篩選字段', + select_filter_fields: '請選擇篩選字段', enter_keywords: '請輸關鍵字', screen_method: '篩選方式', select: '請選擇', diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js index ac40d61414..b8db2dde44 100644 --- a/frontend/src/lang/zh.js +++ b/frontend/src/lang/zh.js @@ -2460,7 +2460,7 @@ export default { add_condition: '添加条件', add_relationship: '添加关系', filter_fields: '筛选字段', - selct_filter_fields: '请选择筛选字段', + select_filter_fields: '请选择筛选字段', enter_keywords: '请输关键字', screen_method: '筛选方式', select: '请选择', diff --git a/frontend/src/views/dataset/data/components/filterFiled.vue b/frontend/src/views/dataset/data/components/filterFiled.vue index 9eaff3666c..3660f1f2b7 100644 --- a/frontend/src/views/dataset/data/components/filterFiled.vue +++ b/frontend/src/views/dataset/data/components/filterFiled.vue @@ -15,7 +15,7 @@