【7.6.0】【sys】【user】完善用户详情返回

kernel-s-sys/sys-api/src/main/java/cn/stylefeng/roses/kernel/sys/api/enums/UserStatusEnum.java

@@ -24,6 +24,9 @@
  */
 package cn.stylefeng.roses.kernel.sys.api.enums;
 
+import cn.hutool.core.convert.Convert;
+import cn.hutool.core.util.ObjectUtil;
+import cn.stylefeng.roses.kernel.rule.base.ReadableEnum;
 import cn.stylefeng.roses.kernel.rule.exception.base.ServiceException;
 import cn.stylefeng.roses.kernel.sys.api.exception.SysException;
 import cn.stylefeng.roses.kernel.sys.api.exception.enums.UserExceptionEnum;
@@ -36,7 +39,7 @@ import lombok.Getter;
  * @since 2020/10/20 18:19
  */
 @Getter
-public enum UserStatusEnum {
+public enum UserStatusEnum implements ReadableEnum<UserStatusEnum> {
 
     /**
      * 启用
@@ -108,4 +111,26 @@ public enum UserStatusEnum {
         throw new SysException(UserExceptionEnum.REQUEST_USER_STATUS_ERROR, code);
     }
 
+    @Override
+    public Object getKey() {
+        return this.code;
+    }
+
+    @Override
+    public Object getName() {
+        return this.message;
+    }
+
+    @Override
+    public UserStatusEnum parseToEnum(String originValue) {
+        if (ObjectUtil.isEmpty(originValue)) {
+            return null;
+        }
+        for (UserStatusEnum value : UserStatusEnum.values()) {
+            if (value.code.equals(Convert.toInt(originValue))) {
+                return value;
+            }
+        }
+        return null;
+    }
 }

kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/entity/SysUser.java

@@ -4,6 +4,8 @@ import cn.stylefeng.roses.kernel.db.api.pojo.entity.BaseExpandFieldEntity;
 import cn.stylefeng.roses.kernel.rule.annotation.ChineseDescription;
 import cn.stylefeng.roses.kernel.rule.annotation.EnumFieldFormat;
 import cn.stylefeng.roses.kernel.rule.enums.SexEnum;
+import cn.stylefeng.roses.kernel.rule.enums.YesOrNotEnum;
+import cn.stylefeng.roses.kernel.sys.api.enums.UserStatusEnum;
 import cn.stylefeng.roses.kernel.sys.api.pojo.UserOrgDTO;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -110,6 +112,7 @@ public class SysUser extends BaseExpandFieldEntity {
      */
     @TableField("super_admin_flag")
     @ChineseDescription("是否是超级管理员：Y-是，N-否")
+    @EnumFieldFormat(processEnum = YesOrNotEnum.class)
     private String superAdminFlag;
 
     /**
@@ -117,6 +120,7 @@ public class SysUser extends BaseExpandFieldEntity {
      */
     @TableField("status_flag")
     @ChineseDescription("状态：1-正常，2-冻结")
+    @EnumFieldFormat(processEnum = UserStatusEnum.class)
     private Integer statusFlag;
 
     /**

kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/service/impl/SysUserServiceImpl.java

@@ -129,6 +129,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         List<Long> userRoleIdList = sysUserServiceApi.getUserRoleIdList(sysUser.getUserId());
         sysUser.setRoleIdList(userRoleIdList);
 
+        // 屏蔽不需要的字段
+        sysUser.setPassword(null);
+
         return sysUser;
     }