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 a4e6822b54109217925e5be88e9f6da8eacbc4a8..cd53c2ec39ff68f606dcad12ce03824b8b32ea09 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(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); }