修复修改用户时手机号不能显示完全的bug

dsk-admin/src/main/java/com/dsk/web/controller/system/SysUserController.java

@@ -24,6 +24,7 @@ import com.dsk.system.domain.SysRole;
 import com.dsk.system.domain.SysUser;
 import com.dsk.system.domain.vo.SysUserExportVo;
 import com.dsk.system.domain.vo.SysUserImportVo;
+import com.dsk.system.domain.vo.SysUserVo;
 import com.dsk.system.listener.SysUserImportListener;
 import com.dsk.system.service.ISysDeptService;
 import com.dsk.system.service.ISysPostService;
@@ -143,7 +144,7 @@ public class SysUserController extends BaseController {
         ajax.put("posts", postService.selectPostAll());
         if (ObjectUtil.isNotNull(userId)) {
             SysUser sysUser = userService.selectUserById(userId);
-            ajax.put("user", sysUser);
+            ajax.put("user", BeanUtil.toBean(sysUser, SysUserVo.class));
             ajax.put("postIds", postService.selectPostListByUserId(userId));
             ajax.put("roleIds", StreamUtils.toList(sysUser.getRoles(), SysRole::getRoleId));
         }

dsk-system/src/main/java/com/dsk/system/domain/vo/SysEnterpriseVo.java

-package com.dsk.system.domain.vo;
-
-import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
-import com.alibaba.excel.annotation.ExcelProperty;
-import com.dsk.common.annotation.ExcelDictFormat;
-import com.dsk.common.convert.ExcelDictConvert;
-import com.dsk.system.domain.SysTenant;
-import io.github.linpeilie.annotations.AutoMapper;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * @author sxk
- * @date 2023.08.22
- * @description:
- */
-@Data
-@ExcelIgnoreUnannotated
-@AutoMapper(target = SysTenant.class)
-public class SysEnterpriseVo implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * id
-     */
-    @ExcelProperty(value = "id")
-    private Long id;
-
-    /**
-     * 企业编号
-     */
-    @ExcelProperty(value = "企业编号")
-    private String enterpriseId;
-
-    /**
-     * 企业名称
-     */
-    @ExcelProperty(value = "企业名称")
-    private String companyName;
-
-    /**
-     * 开始时间
-     */
-    @ExcelProperty(value = "开始时间")
-    private Date startTime;
-
-    /**
-     * 过期时间
-     */
-    @ExcelProperty(value = "过期时间")
-    private Date expireTime;
-
-    /**
-     * 企业方案编号
-     */
-    @ExcelProperty(value = "企业方案编号")
-    private Long programId;
-
-    /**
-     * 用户名称
-     */
-    @ExcelProperty(value = "用户名称")
-    private String username;
-
-    /**
-     * 手机号码
-     */
-    @ExcelProperty(value = "手机号码")
-    private String phone;
-
-    /**
-     * 企业规模
-     */
-    @ExcelProperty(value = "企业规模")
-    private String enterpriseScale;
-
-    /**
-     * 企业状态（0已过期｜1续约）
-     */
-    @ExcelProperty(value = "企业状态", converter = ExcelDictConvert.class)
-    @ExcelDictFormat(readConverterExp = "0=已过期,1=续约")
-    private String status;
-
-}

dsk-system/src/main/java/com/dsk/system/domain/vo/SysUserVo.java

-//package com.dsk.system.domain.vo;
-//
-//import com.dsk.common.annotation.Sensitive;
-//import com.dsk.common.annotation.Translation;
-//import com.dsk.common.constant.TransConstant;
-//import com.dsk.common.enums.SensitiveStrategy;
-//import com.fasterxml.jackson.annotation.JsonIgnore;
-//import com.fasterxml.jackson.annotation.JsonProperty;
-//import io.github.linpeilie.annotations.AutoMapper;
-//import lombok.Data;
-//import org.dromara.common.sensitive.annotation.Sensitive;
-//import org.dromara.common.sensitive.core.SensitiveStrategy;
-//import org.dromara.common.translation.annotation.Translation;
-//import org.dromara.common.translation.constant.TransConstant;
-//import org.dromara.system.domain.SysUser;
-//
-//import java.io.Serializable;
-//import java.util.Date;
-//import java.util.List;
-//
-//
-///**
-// * 用户信息视图对象 sys_user
-// *
-// * @author Michelle.Chung
-// */
-//@Data
-////@AutoMapper(target = SysUser.class)
-//public class SysUserVo implements Serializable {
-//
-//    //@Serial
-//    private static final long serialVersionUID = 1L;
-//
-//    /**
-//     * 用户ID
-//     */
-//    private Long userId;
-//
-//    /**
-//     * 租户ID
-//     */
-//    private String tenantId;
-//
-//    /**
-//     * 部门ID
-//     */
-//    private Long deptId;
-//
-//    /**
-//     * 用户账号
-//     */
-//    private String userName;
-//
-//    /**
-//     * 用户昵称
-//     */
-//    private String nickName;
-//
-//    /**
-//     * 用户类型（sys_user系统用户）
-//     */
-//    private String userType;
-//
-//    /**
-//     * 用户邮箱
-//     */
-//    @Sensitive(strategy = SensitiveStrategy.EMAIL)
-//    private String email;
-//
-//    /**
-//     * 手机号码
-//     */
-//    @Sensitive(strategy = SensitiveStrategy.PHONE)
-//    private String phonenumber;
-//
-//    /**
-//     * 用户性别（0男 1女 2未知）
-//     */
-//    private String sex;
-//
-//    /**
-//     * 头像地址
-//     */
-////    @Translation(type = TransConstant.OSS_ID_TO_URL)
-//    private String avatar;
-//
-//    /**
-//     * 密码
-//     */
-//    @JsonIgnore
-//    @JsonProperty
-//    private String password;
-//
-//    /**
-//     * 帐号状态（0正常 1停用）
-//     */
-//    private String status;
-//
-//    /**
-//     * 最后登录IP
-//     */
-//    private String loginIp;
-//
-//    /**
-//     * 最后登录时间
-//     */
-//    private Date loginDate;
-//
-//    /**
-//     * 备注
-//     */
-//    private String remark;
-//
-//    /**
-//     * 创建时间
-//     */
-//    private Date createTime;
-//
-//    /**
-//     * 部门对象
-//     */
-//    private SysDeptVo dept;
-//
-//    /**
-//     * 角色对象
-//     */
-//    private List<SysRoleVo> roles;
-//
-//    /**
-//     * 角色组
-//     */
-//    private Long[] roleIds;
-//
-//    /**
-//     * 岗位组
-//     */
-//    private Long[] postIds;
-//
-//    /**
-//     * 数据权限 当前角色ID
-//     */
-//    private Long roleId;
-//
-//}
+package com.dsk.system.domain.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.dsk.common.annotation.Sensitive;
+import com.dsk.common.enums.SensitiveStrategy;
+import com.dsk.common.tenant.core.TenantEntity;
+import com.dsk.system.domain.SysDept;
+import com.dsk.system.domain.SysRole;
+import com.dsk.system.domain.SysUser;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 用户对象 sys_user
+ *
+ * @author Lion Li
+ */
+
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = SysUser.class)
+@NoArgsConstructor
+public class SysUserVo extends TenantEntity {
+
+    /**
+     * 用户ID
+     */
+    private Long userId;
+
+    /**
+     * 部门ID
+     */
+    private Long deptId;
+
+    /**
+     * 用户账号
+     */
+    private String userName;
+
+    /**
+     * 用户昵称
+     */
+    private String nickName;
+
+    /**
+     * 用户类型（sys_user系统用户）
+     */
+    private String userType;
+
+    /**
+     * 用户邮箱
+     */
+    @Sensitive(strategy = SensitiveStrategy.EMAIL)
+    private String email;
+
+    /**
+     * 手机号码
+     */
+    private String phonenumber;
+
+    /**
+     * 用户性别
+     */
+    private String sex;
+
+    /**
+     * 用户头像
+     */
+    private String avatar;
+
+    /**
+     * 帐号状态（0正常 1停用）
+     */
+    private String status;
+
+    /**
+     * 删除标志（0代表存在 2代表删除）
+     */
+    private String delFlag;
+
+    /**
+     * 最后登录IP
+     */
+    private String loginIp;
+
+    /**
+     * 最后登录时间
+     */
+    private Date loginDate;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 部门对象
+     */
+    private SysDept dept;
+
+    /**
+     * 角色对象
+     */
+    private List<SysRole> roles;
+
+    /**
+     * 角色组
+     */
+    private Long[] roleIds;
+
+    /**
+     * 岗位组
+     */
+    private Long[] postIds;
+
+    /**
+     * 数据权限 当前角色ID
+     */
+    private Long roleId;
+
+}