用户权限调整 岗位功能调整完成

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java

@@ -1,5 +1,8 @@
 package cn.estsh.i3plus.pojo.base.bean;
 
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
+
 import java.util.HashMap;
 
 /**
@@ -49,6 +52,21 @@ public class DdlPackBean {
         hqlPreparedMap = new HashMap<>();
     }
 
+    /**
+     * 查询制定组织有效的数据
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getDdlPackBean(String organizeCode){
+        DdlPackBean result = new DdlPackBean();
+
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",result);
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(),"isValid",result);
+        DdlPreparedPack.getNumEqualPack(organizeCode,"organizeCode",result);
+
+        return result;
+    }
+
     public boolean isHql() {
         return isHql;
     }

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java

@@ -102,10 +102,10 @@ public class CoreHqlPack {
     }
 
     public static DdlPackBean packHqlSysPosition(SysPosition position,List<Long> idList){
-        DdlPackBean result = new DdlPackBean();
+        DdlPackBean result = DdlPackBean.getDdlPackBean(position.getOrganizeCode());
 
         // 查询参数封装
-        DdlPreparedPack.getNumEqualPack(position.getParentId(),"parentId",result);
+//        DdlPreparedPack.getNumEqualPack(position.getParentId(),"parentId",result);
         // String Like
         DdlPreparedPack.getStringLikerPack(position.getName(),"name",result);
         DdlPreparedPack.getStringLikerPack(position.getPositionCode(),"positionCode",result);