From 19f42b49778e05fba926d9aeca43e89ba5c65531 Mon Sep 17 00:00:00 2001 From: liao Date: Wed, 13 Sep 2023 15:29:34 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E6=B3=95=E8=A7=84=E5=88=86=E9=A1=B5?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=A0=B9=E6=8D=AE=E5=B7=A6=E4=BE=A7=E6=A0=91?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../laws/common/service/impl/LawsCommonServiceImpl.java | 6 ++++-- .../laws/standard/controller/LawsDomesticController.java | 4 ---- .../laws/standard/controller/LawsEnterpriseController.java | 4 ---- .../laws/standard/controller/LawsOverseasController.java | 4 ---- 4 files changed, 4 insertions(+), 14 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java index 2251565f..73db3a18 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java @@ -643,8 +643,10 @@ public class LawsCommonServiceImpl implements ILawsCommonService { // 处理左侧树code查询 String nodeCode = (String) parameterMap.get(FieldCommon.NODE_CODE); // 获取树节点code - selectCondition.append(" and id in (select unique_relation_flag from laws_node_relation " + - "where node_code like concat('" + nodeCode + "','%'))"); + if (StringUtils.isNotBlank(nodeCode) && nodeCode.length() > 3) { + selectCondition.append(" and id in (select unique_relation_flag from laws_node_relation " + + "where node_code like concat('" + nodeCode + "','%'))"); + } //处理列表表头排序 String orderByField = (String) parameterMap.get(FieldCommon.ORDER_BY_FIELD); diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsDomesticController.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsDomesticController.java index c061da41..1ad54989 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsDomesticController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsDomesticController.java @@ -40,10 +40,6 @@ public class LawsDomesticController { @PostMapping(value = "/getCommonPage") public Result>> getCommonPage(@RequestBody Map parameterMap) { parameterMap.put(FieldCommon.MODULE, MODULE_VALUE); - // 如果没有选择树节点，则是根节点 - if (Objects.isNull(parameterMap.get(FieldCommon.NODE_CODE))) { - parameterMap.put(FieldCommon.NODE_CODE, "A02"); - } return Result.OK(lawsCommonService.getCommonPage(parameterMap)); } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsEnterpriseController.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsEnterpriseController.java index 3f4a821c..205ea67d 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsEnterpriseController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsEnterpriseController.java @@ -40,10 +40,6 @@ public class LawsEnterpriseController { @PostMapping(value = "/getCommonPage") public Result>> getCommonPage(@RequestBody Map parameterMap) { parameterMap.put(FieldCommon.MODULE, MODULE_VALUE); - // 如果没有选择树节点，则是根节点 - if (Objects.isNull(parameterMap.get(FieldCommon.NODE_CODE))) { - parameterMap.put(FieldCommon.NODE_CODE, "A01"); - } return Result.OK(lawsCommonService.getCommonPage(parameterMap)); } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsOverseasController.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsOverseasController.java index 7f2f1051..e5fcb00a 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsOverseasController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsOverseasController.java @@ -40,10 +40,6 @@ public class LawsOverseasController { @PostMapping(value = "/getCommonPage") public Result>> getCommonPage(@RequestBody Map parameterMap) { parameterMap.put(FieldCommon.MODULE, MODULE_VALUE); - // 如果没有选择树节点，则是根节点 - if (Objects.isNull(parameterMap.get(FieldCommon.NODE_CODE))) { - parameterMap.put(FieldCommon.NODE_CODE, "A03"); - } return Result.OK(lawsCommonService.getCommonPage(parameterMap)); }