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

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

@@ -71,4 +71,8 @@ public class SysOrganize extends BaseBean {
     @ApiParam(value ="子集列表")
     private List<SysOrganize> childList;
 
+    @Transient
+    @ApiParam(value ="子集ID列表")
+    private List<Long> childIdList;
+
 }

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

@@ -146,7 +146,7 @@ public class SysUser extends BaseBean {
     @Transient
     @ApiParam(value ="角色ID集合" , example = "0")
     @JsonSerialize(using = ToStringSerializer.class)
-    private List<Long> roleIdList;
+    private List<String> roleIdList;
     
     @Transient
     @ApiParam(value ="账号所有角色信息")

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

@@ -193,6 +193,10 @@ public class  SysUserInfo extends BaseBean {
     private List<SysDepartment> departmentList;
 
     @Transient
+    @ApiParam(value ="用户所有部门Id信息")
+    private List<String> departmentIdList;
+
+    @Transient
     @ApiParam(value ="用户所有岗位信息")
     private List<SysPosition> positionList;
 
@@ -201,6 +205,10 @@ public class  SysUserInfo extends BaseBean {
     private List<SysOrganize> organizeList;
 
     @Transient
+    @ApiParam(value ="用户所有组织Id信息")
+    private List<String> organizeIdList;
+
+    @Transient
     @ApiParam(value ="用户部门信息")
     private SysDepartment department;
 

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

@@ -117,7 +117,10 @@ public class CoreHqlPack {
         StringBuffer result = new StringBuffer();
 
         // 查询参数封装
-        HqlPack.getNumEqualPack(organize.getParentId(),"parentId",result);
+        if(organize.getChildIdList() != null){
+            HqlPack.getInPack(StringUtils.join(organize.getChildIdList(),","),"parentId",result);
+        }
+
         HqlPack.getStringLikerPack(organize.getName(),"name",result);
         HqlPack.getStringLikerPack(organize.getOrganizeCode(),"organizeCode",result);
 
@@ -377,6 +380,10 @@ public class CoreHqlPack {
             HqlPack.getInPack(StringUtils.join(user.getRoleIdList(),","),"id",result);
         }
 
+        if(user.getDepartmentIdList() != null){
+            HqlPack.getInPack(StringUtils.join(user.getDepartmentIdList(),","),"id",result);
+        }
+
         // And Like % %
         HqlPack.getStringLikerPack(user.getUserName(),"userName",result);
         HqlPack.getStringLikerPack(user.getUserLoginName(),"userLoginName",result);
@@ -438,11 +445,15 @@ public class CoreHqlPack {
 
         // And
         HqlPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(),"isValid",result);
-        HqlPack.getNumEqualPack(userInfo.getOrganizeId(),"organizeId",result);
-        HqlPack.getNumEqualPack(userInfo.getDepartmentId(),"departmentId",result);
+//        HqlPack.getNumEqualPack(userInfo.getOrganizeId(),"organizeId",result);
+//        HqlPack.getNumEqualPack(userInfo.getDepartmentId(),"departmentId",result);
         HqlPack.getNumEqualPack(userInfo.getPositionId(),"positionId",result);
         HqlPack.getNumEqualPack(userInfo.getUserInfoStatus(),"userInfoStatus",result);
 
+        if(userInfo.getDepartmentIdList() != null && userInfo.getDepartmentIdList().size() > 0){
+            HqlPack.getInPack(StringUtils.join(userInfo.getDepartmentIdList(), ","), "departmentId", result);
+        }
+
         // Like
         HqlPack.getStringLikerPack(userInfo.getName(),"name",result);
         HqlPack.getStringLikerPack(userInfo.getUserEmpNo(),"userEmpNo",result);