From c3cf8452f750b6bbdf56123d3e54ef78b376d027 Mon Sep 17 00:00:00 2001 From: liao Date: Wed, 18 Oct 2023 17:43:09 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E5=AD=97=E5=85=B8=E6=A0=91=E5=9E=8B?= =?UTF-8?q?=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/controller/SysDictItemController.java | 2 +- .../service/impl/LawsAsmsOpenApiServiceImpl.java | 13 +++++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/laws-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java b/laws-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java index f3665a44..dc7eb0bc 100644 --- a/laws-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java +++ b/laws-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java @@ -167,7 +167,7 @@ public class SysDictItemController { tree.setWeight(treeNode.getSortOrder()); tree.setName(treeNode.getItemText()); tree.putExtra("key", id); - tree.putExtra("value", id); + tree.putExtra("value", treeNode.getItemValue()); tree.putExtra("title", treeNode.getItemText()); }); diff --git a/laws-modules-docking/src/main/java/com/jero/modules/docking/asms/api/service/impl/LawsAsmsOpenApiServiceImpl.java b/laws-modules-docking/src/main/java/com/jero/modules/docking/asms/api/service/impl/LawsAsmsOpenApiServiceImpl.java index 66bc2ba7..75735135 100644 --- a/laws-modules-docking/src/main/java/com/jero/modules/docking/asms/api/service/impl/LawsAsmsOpenApiServiceImpl.java +++ b/laws-modules-docking/src/main/java/com/jero/modules/docking/asms/api/service/impl/LawsAsmsOpenApiServiceImpl.java @@ -240,10 +240,15 @@ public class LawsAsmsOpenApiServiceImpl extends ServiceImpl idList) { List lawsAsmsOpenApiList = listByIds(idList); - List dictIdList = lawsAsmsOpenApiList.stream() - .filter(e -> StringUtils.isNotBlank(e.getDictId())) - .map(LawsAsmsOpenApi::getDictId).collect(Collectors.toList()); - if (CollectionUtils.isNotEmpty(dictIdList)) { + lawsAsmsOpenApiList = lawsAsmsOpenApiList.stream() + .filter(e -> StringUtils.isNotBlank(e.getDictId())).collect(Collectors.toList()); + if (CollectionUtils.isNotEmpty(lawsAsmsOpenApiList)) { + List dictIdList = lawsAsmsOpenApiList.stream() + .map(LawsAsmsOpenApi::getDictId).collect(Collectors.toList()); + // 状态转为未同步 + lawsAsmsOpenApiList.forEach(e -> e.setStatus("0")); + updateBatchById(lawsAsmsOpenApiList); + // 物理删除字典配置项 lawsAsmsOpenApiMapper.removeDictItemBatch(dictIdList); } }