组织树 数据权限修复

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

@@ -8,6 +8,7 @@ import cn.estsh.i3plus.pojo.platform.bean.*;
 import org.apache.commons.lang3.StringUtils;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @Description : 平台对象封装
@@ -146,6 +147,17 @@ public class CoreHqlPack {
         return result.toString();
     }
 
+    public static DdlPackBean packHqlSysOrganize(SysOrganize organize,List<Long> idList){
+        DdlPackBean result = new DdlPackBean();
+
+        // String Like
+        DdlPreparedPack.getStringLikerPack(organize.getName(),"name",result);
+        DdlPreparedPack.getStringLikerPack(organize.getName(),"organizeCode",result);
+        // Number In
+        DdlPreparedPack.getInPackList(idList,"id",result);
+        return result;
+    }
+
     public static String packHqlSysOrganize(Long[] ids, Integer typeId){
         StringBuffer result = new StringBuffer();
 
@@ -784,4 +796,18 @@ public class CoreHqlPack {
 
         return ddlPackBean;
     }
+
+    /**
+     * 查询当前用户所有组织数据
+     * @param sysRefUserDepartments
+     * @return
+     */
+    public static DdlPackBean packHqlSysOrganize(List<SysRefUserDepartment> sysRefUserDepartments){
+        DdlPackBean packBean = new DdlPackBean();
+        DdlPreparedPack.getInPackList(sysRefUserDepartments.stream().map(d -> d.getOrganizeId()).collect(Collectors.toList()),"id",packBean);
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(),"isValid",packBean);
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(),"isDeleted",packBean);
+
+        return packBean;
+    }
 }