From 9ca9dea72adc9ba155c45ff5243df9e8ea0c4f3c Mon Sep 17 00:00:00 2001 From: Parker Date: Tue, 30 May 2023 20:59:22 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=A7=9F=E6=88=B7?= =?UTF-8?q?=E7=BB=84=E7=BB=87=E4=B8=BA=E7=A9=BA=EF=BC=8C=E8=BF=9B=E5=85=A5?= =?UTF-8?q?=E7=A7=9F=E6=88=B7=E5=88=97=E8=A1=A8=E6=8A=A5=E9=94=99=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/opsli/modulars/system/org/web/SysOrgRestController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/org/web/SysOrgRestController.java b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/org/web/SysOrgRestController.java index a4e6822..928e1a5 100644 --- a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/org/web/SysOrgRestController.java +++ b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/org/web/SysOrgRestController.java @@ -188,7 +188,7 @@ public class SysOrgRestController extends BaseRestController wrapperByEmpty = queryBuilder.build(); - wrapperByEmpty.in(FieldUtil.humpToUnderline(MyBatisConstants.FIELD_ID), genOrgIdSet); + wrapperByEmpty.in(!genOrgIdSet.isEmpty(), FieldUtil.humpToUnderline(MyBatisConstants.FIELD_ID), genOrgIdSet); // 如果传入ID 则不包含自身 if(StringUtils.isNotEmpty(id)){ wrapperByEmpty.notIn(FieldUtil.humpToUnderline(MyBatisConstants.FIELD_ID), id); From 535a5da781cdb37db027cbad5f478abcd17eb852 Mon Sep 17 00:00:00 2001 From: Parker Date: Wed, 31 May 2023 10:50:14 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/org/web/SysOrgRestController.java | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/org/web/SysOrgRestController.java b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/org/web/SysOrgRestController.java index 928e1a5..cd53c2e 100644 --- a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/org/web/SysOrgRestController.java +++ b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/org/web/SysOrgRestController.java @@ -166,11 +166,9 @@ public class SysOrgRestController extends BaseRestController dataList = IService.findList(wrapper); @@ -188,12 +186,11 @@ public class SysOrgRestController extends BaseRestController wrapperByEmpty = queryBuilder.build(); - wrapperByEmpty.in(!genOrgIdSet.isEmpty(), FieldUtil.humpToUnderline(MyBatisConstants.FIELD_ID), genOrgIdSet); + wrapperByEmpty.in(!genOrgIdSet.isEmpty(), + FieldUtil.humpToUnderline(MyBatisConstants.FIELD_ID), genOrgIdSet); // 如果传入ID 则不包含自身 - if(StringUtils.isNotEmpty(id)){ - wrapperByEmpty.notIn(FieldUtil.humpToUnderline(MyBatisConstants.FIELD_ID), id); - } - + wrapperByEmpty.notIn(StringUtils.isNotEmpty(id), + FieldUtil.humpToUnderline(MyBatisConstants.FIELD_ID), id); // 获得组织 dataList = IService.findList(wrapperByEmpty); }