gateway

urbanLifelineServ/apis/api-system/pom.xml

@@ -18,5 +18,17 @@
         <maven.compiler.source>21</maven.compiler.source>
         <maven.compiler.target>21</maven.compiler.target>
     </properties>
+    <dependencies>
+        <dependency>
+            <groupId>org.xyzh.common</groupId>
+            <artifactId>common-dto</artifactId>
+            <version>${urban-lifeline.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.xyzh.common</groupId>
+            <artifactId>common-utils</artifactId>
+            <version>${urban-lifeline.version}</version>
+        </dependency>
+    </dependencies>
 
 </project>

urbanLifelineServ/apis/api-system/src/main/java/org/xyzh/api/system/vo/SysUserVO.java

@@ -7,6 +7,7 @@ import org.xyzh.common.vo.BaseVO;
 
 import org.xyzh.common.dto.sys.TbSysUserDTO;
 import org.xyzh.common.dto.sys.TbSysUserInfoDTO;
+import org.xyzh.common.utils.crypto.AesEncryptUtil;
 
 import java.util.List;
 
@@ -34,7 +35,7 @@ public class SysUserVO extends BaseVO {
 
     @Schema(description = "邮箱")
     private String email;
-
+    
     @Schema(description = "手机")
     private String phone;
 
@@ -47,8 +48,8 @@ public class SysUserVO extends BaseVO {
     @Schema(description = "用户状态")
     private String status;
 
-    @Schema(description = "用户类型")
-    private String userType;
+    @Schema(description = "创建人")
+    private String creator;
 
     // TbSysUserInfoDTO对应字段
     @Schema(description = "用户名")
@@ -79,6 +80,11 @@ public class SysUserVO extends BaseVO {
     @Schema(description = "用户视图权限列表")
     private List<PermissionVO> viewPermissions;
 
+    public void setPhone(String phone){
+        this.phone = phone;
+        this.phoneHash = AesEncryptUtil.maskPhone(phone);
+    }
+
     public static TbSysUserDTO toDTO(SysUserVO vo) {
         if (vo == null) {
             return null;
@@ -91,10 +97,8 @@ public class SysUserVO extends BaseVO {
         dto.setPhone(vo.getPhone());
         dto.setWechatId(vo.getWechatId());
         dto.setStatus(vo.getStatus());
-        dto.setUserType(vo.getUserType());
         dto.setOptsn(vo.getOptsn());
         dto.setCreator(vo.getCreator());
-        dto.setUpdater(vo.getUpdater());
         dto.setDeptPath(vo.getDeptPath());
         dto.setRemark(vo.getRemark());
         dto.setCreateTime(vo.getCreateTime());
@@ -120,7 +124,6 @@ public class SysUserVO extends BaseVO {
         // 继承自 BaseDTO 的字段
         userInfoDTO.setOptsn(userVO.getOptsn());
         userInfoDTO.setCreator(userVO.getCreator());
-        userInfoDTO.setUpdater(userVO.getUpdater());
         userInfoDTO.setDeptPath(userVO.getDeptPath());
         userInfoDTO.setRemark(userVO.getRemark());
         userInfoDTO.setCreateTime(userVO.getCreateTime());