Merge pull request #32 from hiparker/development

Development

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<SysOrg, SysOrgModel
             wrapper.eq(FieldUtil.humpToUnderline(MyBatisConstants.FIELD_PARENT_ID), parentId);
 
             // 如果传入ID 则不包含自身
-            if(StringUtils.isNotEmpty(id)){
+            wrapper.notIn(StringUtils.isNotEmpty(id),
-                wrapper.notIn(
                         FieldUtil.humpToUnderline(MyBatisConstants.FIELD_ID), id);
 
-            }
 
             // 获得组织
             List<SysOrg> dataList = IService.findList(wrapper);
@@ -188,12 +186,11 @@ public class SysOrgRestController extends BaseRestController<SysOrg, SysOrgModel
 
 
                 QueryWrapper<SysOrg> 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(StringUtils.isNotEmpty(id),
-                    wrapperByEmpty.notIn(FieldUtil.humpToUnderline(MyBatisConstants.FIELD_ID), id);
+                        FieldUtil.humpToUnderline(MyBatisConstants.FIELD_ID), id);
-                }
-
                 // 获得组织
                 dataList = IService.findList(wrapperByEmpty);
             }