用户管理更新

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserDetailModel.java

@@ -156,11 +156,12 @@ public class UserDetailModel extends BaseBean {
         user.setId(!StringUtils.isBlank(this.userId) ? Long.parseLong(this.userId) : null);
         user.setUserInfoId(!StringUtils.isBlank(this.userInfoId) ? Long.parseLong(this.userInfoId) : null);
         user.setUserLoginName(this.userLoginName);
+        user.setUserEmpNo(this.infoEmpNo);
         user.setUserName(this.infoName);
         user.setUserEmail(this.userEmail);
         user.setUserPhone(this.userPhone);
         user.setUserLoginPassword(this.userLoginPassword);
-        user.setUserEmpNo(this.infoEmpNo);
+        user.setLanguageCode(this.userLanguageCode);
 
         return user;
     }
@@ -195,7 +196,6 @@ public class UserDetailModel extends BaseBean {
         info.setUserGrade(this.infoGrade);
         info.setUserEmployeeType(this.infoEmployeeType);
 
-
         return info;
     }
 

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

@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * @Description : 操作人对象，用于登陆，非持久化
@@ -39,6 +40,18 @@ public class SessionUser implements Serializable {
     @ApiParam("用户对象信息")
     private SysUserInfo userInfo;
 
+    @ApiParam("主要组织信息")
+    private SysOrganize organize;
+
+    @ApiParam("主要组织集合")
+    private List<SysOrganize> organizeList;
+
+    @ApiParam("主要部门信息")
+    private SysDepartment department;
+
+    @ApiParam("主要部门集合")
+    private List<SysDepartment> departmentList;
+
     public SessionUser() {
     }
 

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

@@ -93,10 +93,6 @@ public class SysUser extends BaseBean {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long organizeId;
 
-    @Column(name="ROLE_IDS")
-    @ApiParam(value ="角色ID集合" , example = "0")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private String roleIds;
 
 /********************************** 冗余信息 ********************************/
 
@@ -131,6 +127,16 @@ public class SysUser extends BaseBean {
     private List<SysDepartment> departmentList;
 
     @Transient
+    @ApiParam(value ="角色ID" , example = "0")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private String roleId;
+
+    @Transient
+    @ApiParam(value ="角色ID集合" , example = "0")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private List<Long> roleIdList;
+    
+    @Transient
     @ApiParam(value ="账号所有角色信息")
     private List<SysRole> roleList;
 
@@ -138,5 +144,4 @@ public class SysUser extends BaseBean {
     @ApiParam(value ="账号所有操作权限信息")
     private List<SysMenu> menuList;
 
-
 }

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

@@ -324,10 +324,14 @@ public class CoreHqlPack {
         StringBuffer result = new StringBuffer();
 
         // And X = X
-        HqlPack.getNumEqualPack(user.getIsValid(),"isValid",result);
-//        HqlPack.getNumEqualPack(user.getDepartmentId(),"departmentId",result);
-//        HqlPack.getNumEqualPack(user.getRoleId(),"roleId",result);
+        HqlPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(),"isValid",result);
+        HqlPack.getNumEqualPack(user.getDepartmentId(),"departmentId",result);
         HqlPack.getNumEqualPack(user.getUserStatus(),"userStatus",result);
+
+        if(user.getRoleIdList() != null){
+            HqlPack.getInPack(StringUtils.join(user.getRoleIdList(),","),"id",result);
+        }
+
         // And Like % %
         HqlPack.getStringLikerPack(user.getUserName(),"userName",result);
         HqlPack.getStringLikerPack(user.getUserLoginName(),"userLoginName",result);
@@ -379,6 +383,7 @@ public class CoreHqlPack {
         StringBuffer result = new StringBuffer();
 
         // 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.getPositionId(),"positionId",result);