Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev

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

@@ -37,6 +37,10 @@ public class SysMenu extends BaseBean {
     @ApiParam(value ="功能名称")
     private String name;
 
+    @Column(name="NAME_ZH_SHORTENING")
+    @ApiParam(value ="功能名称中文简写")
+    private String nameZhShortening;
+
     @Column(name="MENU_CODE")
     @ApiParam(value ="功能代码")
     private String menuCode;
@@ -65,7 +69,7 @@ public class SysMenu extends BaseBean {
 
     @Column(name="MENU_SORT")
     @ApiParam(value ="资源排序", example = "0")
-    private String menuSort;
+    private Integer menuSort;
 
     @Column(name="MENU_URL")
     @ApiParam(value ="资源 url" , access ="资源 url")

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

@@ -45,11 +45,19 @@ public class SysRefUserDepartment extends BaseBean {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long departmentId;
 
- 
     @Column(name="DEPARTMENT_NAME_RDD")
     @ApiParam(value ="部门名称")
     private String departmentNameRdd;
 
+    @Column(name="ORGANIZE_ID")
+    @ApiParam(value ="组织ID" , example = "-1")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long organizeId;
+
+    @Column(name="ORGANIZE_NAME_RDD")
+    @ApiParam(value ="组织名称")
+    private String organizeNameRdd;
+
     public SysRefUserDepartment() {
     }
 

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

@@ -122,7 +122,7 @@ public class  SysUserInfo extends BaseBean {
     private List<SysDepartment> departmentList;
 
     @Transient
-    @ApiParam("用户的部门ID信息")
+    @ApiParam("用户的部门ID信息集合")
     private List<String> departmentIdList;
 
     @Transient
@@ -138,6 +138,10 @@ public class  SysUserInfo extends BaseBean {
     private List<SysOrganize> organizeList;
 
     @Transient
+    @ApiParam("用户的组织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

@@ -133,12 +133,12 @@ public class CoreHqlPack {
     public static String packHqlSysDepartment(SysDepartment department){
         StringBuffer result = new StringBuffer();
 
-        if(department.getOrganizeId() != null && department.getOrganizeId() > 0){
+//        if(department.getOrganizeId() != null && department.getOrganizeId() > 0){
-            department.setParentId(CommonEnumUtil.PARENT.DEFAULT.getValue());
+//            department.setParentId(CommonEnumUtil.PARENT.DEFAULT.getValue());
-        }
+//        }
 
         HqlPack.getNumEqualPack(department.getParentId(),"parentId",result);
-        HqlPack.getNumEqualPack(department.getOrganizeId(),"organizeId",result);
+//        HqlPack.getNumEqualPack(department.getOrganizeId(),"organizeId",result);
         HqlPack.getStringLikerPack(department.getName(),"name",result);
         HqlPack.getStringLikerPack(department.getDepartmentCode(),"departmentCode",result);
 
@@ -390,6 +390,27 @@ public class CoreHqlPack {
     }
 
     /**
+     * 用户信息 复杂查询拼接
+     * @param userInfo
+     * @return
+     */
+    public static String packHqlSysUserInfo(SysUserInfo userInfo,List<Long> idList){
+        StringBuffer result = new StringBuffer();
+
+        // And
+        HqlPack.getNumEqualPack(userInfo.getUserInfoStatus(),"userInfoStatus",result);
+        if(idList != null && idList.size() > 0){
+            HqlPack.getInPack(StringUtils.join(idList, ","), "id", result);
+        }
+
+        // Like
+        HqlPack.getStringLikerPack(userInfo.getName(),"name",result);
+        HqlPack.getStringLikerPack(userInfo.getUserEmpNo(),"userEmpNo",result);
+
+        return  result.toString();
+    }
+
+    /**
      * 查询语言代码是否重复
      * @param localeLanguage
      * @return