添加 岗位Tree

添加 部门Tree
添加 组织Tree
添加 功能Tree

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java

@@ -285,7 +285,6 @@ public class CommonEnumUtil {
         }
     }
 
-
     /**
      * 数据状态
      *  1 启用

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

@@ -55,9 +55,6 @@ public class Department extends BaseBean {
         }
     }
 
-    @ApiParam(value ="子部门列表")
-    private transient List<Department> childList;
- 
     @Column(name="RED_ORGANIZATION_NAME")
     @ApiParam(value ="所属组织名称" , access ="所属组织名称")
     private String redOrganizeName;
@@ -71,4 +68,7 @@ public class Department extends BaseBean {
     @ApiParam(value ="排序" , example ="1" , access ="排序")
     private Integer departmentSort;
 
+    @ApiParam(value ="子集列表")
+    private transient List<Department> childList;
+
 }

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

@@ -13,6 +13,7 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 import java.text.DecimalFormat;
+import java.util.List;
 
 /**
  * @Description : 组织
@@ -71,4 +72,6 @@ public class Organize extends BaseBean {
     @ApiParam(value ="组织状态（枚举：1.正常，2.禁用）" , example ="1")
     private Integer organizeStatus;
 
+    @ApiParam(value ="子集列表")
+    private transient List<Organize> childList;
 }

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

@@ -38,10 +38,10 @@ public class Position extends BaseBean {
     @ApiParam(value ="岗位代码" , access ="岗位代码")
     private String positionCode;
 
+    // 默认值 -1
     @Column(name="PARENT_ID")
     @ApiParam(value ="上级岗位" , example ="-1" , access ="上级岗位")
     @JsonSerialize(using = ToStringSerializer.class)
-    // 默认值 -1
     private Long parentId;
 
     public Long getParentId() {

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

@@ -29,7 +29,7 @@ public class SessionUser implements Serializable {
 
     @ApiParam("用户类型")
     //CommonEnumUtil.USER_TYPE.xxx.getCode()
-    private Integer userTypeId;
+    private String userTypeId;
 
     @ApiParam("用户信息")
     private SysUser user;
@@ -61,7 +61,7 @@ public class SessionUser implements Serializable {
 
     }
 
-    public SessionUser(String userCode, String userName, String siteCode, String languageCode, Integer userTypeId) {
+    public SessionUser(String userCode, String userName, String siteCode, String languageCode, String userTypeId) {
         this.userCode = userCode;
         this.userName = userName;
         this.languageCode = languageCode;

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

@@ -13,6 +13,7 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 import java.text.DecimalFormat;
+import java.util.List;
 
 /**
  * @Description : 系统功能
@@ -79,4 +80,7 @@ public class SysMenu extends BaseBean {
     @ApiParam(value ="功能状态（1.正常，2.禁用）" , example ="1" , access ="功能状态（1.正常，2.禁用）",defaultValue="1")
     private Integer menuStatus = 1;
 
+    @ApiParam(value ="子集列表")
+    private transient List<SysMenu> childList;
+
 }

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

@@ -60,7 +60,7 @@ public class CoreHqlPack {
      * @param position
      * @return
      */
-    public static String packHqlPosition(Position position) {
+    public static String packHqlDepartment(Position position) {
         StringBuffer result = new StringBuffer();
 
         // 岗位名称
@@ -73,7 +73,6 @@ public class CoreHqlPack {
         return result.toString();
     }
 
-
     /**
      * In 参数封装
      * @param columnName
@@ -87,13 +86,12 @@ public class CoreHqlPack {
         return result.toString();
     }
 
-
     /**
      * 部门复杂查询
      * @param department
      * @return
      */
-    public static String packHqlPosition(Department department) {
+    public static String packHqlDepartment(Department department) {
         StringBuffer result = new StringBuffer();
 
         // 部门名称
@@ -107,4 +105,20 @@ public class CoreHqlPack {
 
         return result.toString();
     }
+
+    /**
+     * 岗位复杂查询
+     * @param position
+     * @return
+     */
+    public static String packHqlPosition(Position position){
+        StringBuffer result = new StringBuffer();
+
+        // 查询参数封装
+        HqlPack.getNumEqualPack(position.getParentId(),"parentId",result);
+        HqlPack.getStringLikerPack(position.getName(),"name",result);
+        HqlPack.getStringLikerPack(position.getPositionCode(),"positionCode",result);
+
+        return result.toString();
+    }
 }