Merge remote-tracking branch 'remotes/origin/dev' into test

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,30 @@ 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 static DdlPackBean getDdlPackBean(){
+        DdlPackBean result = new DdlPackBean();
+
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",result);
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(),"isValid",result);
+
+        return result;
+    }
+
     public boolean isHql() {
         return isHql;
     }

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java

@@ -144,7 +144,7 @@ public class SysUser extends BaseBean {
     @Transient
     @ApiParam(value ="角色ID" , example = "0")
     @JsonSerialize(using = ToStringSerializer.class)
-    private String roleId;
+    private Long roleId;
 
     @Transient
     @ApiParam(value ="角色ID集合" , example = "0")

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);
@@ -196,6 +196,17 @@ public class CoreHqlPack {
         return result.toString();
     }
 
+    public static DdlPackBean packDdlBeanSysDepartment(SysDepartment department,List<Long> idList){
+        DdlPackBean result = DdlPackBean.getDdlPackBean();
+
+        DdlPreparedPack.getStringLikerPack(department.getName(),"name",result);
+        DdlPreparedPack.getStringLikerPack(department.getName(),"departmentCode",result);
+        DdlPreparedPack.getInPackList(idList,"id",result);
+
+        result.setOrderByStr(department.orderBy());
+        return result;
+    }
+
     /**
      * 系统权限复杂查询
      * @param menu
@@ -459,6 +470,21 @@ public class CoreHqlPack {
         return  result.toString();
     }
 
+    public static DdlPackBean packDdlBeanSysUser(SysUser user,List<Long> idList){
+        DdlPackBean result = DdlPackBean.getDdlPackBean();
+
+        DdlPreparedPack.getNumEqualPack(user.getUserStatus(),"userStatus",result);
+        DdlPreparedPack.getStringLikerPack(user.getUserLoginName(),"",result);
+        DdlPreparedPack.getStringLikerPack(user.getUserName(),"userName",result);
+        DdlPreparedPack.getStringLikerPack(user.getUserEmail(),"userEmail",result);
+        DdlPreparedPack.getStringLikerPack(user.getUserPhone(),"userPhone",result);
+
+        DdlPreparedPack.getInPackList(idList,"id",result);
+        result.setOrderByStr(user.orderBy());
+
+        return result;
+    }
+
     /**
      * 账号复杂查询
      * @param user
@@ -837,6 +863,21 @@ public class CoreHqlPack {
         return result;
     }
 
+    public static DdlPackBean packDdlBeanSysRefUserRole(Long userId,Long roleId,String organizeCode){
+        DdlPackBean result = DdlPackBean.getDdlPackBean();
+
+        // Number Eq
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(),"isDeleted",result);
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(),"isValid",result);
+        DdlPreparedPack.getNumEqualPack(userId,"userId",result);
+        DdlPreparedPack.getNumEqualPack(roleId,"roleId",result);
+
+        // String Eq
+        DdlPreparedPack.getStringEqualPack(organizeCode,"organizeCode",result);
+
+        return result;
+    }
+
     /**
      * 查询当前用户所有组织数据
      * @param sysRefUserDepartments