改校验

ruoyi-system/src/main/java/com/ruoyi/system/domain/OpenAccount.java

@@ -1,6 +1,9 @@
 package com.ruoyi.system.domain;
 
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.ruoyi.common.annotation.Sensitive;
@@ -8,12 +11,12 @@ import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.core.domain.entity.SysDept;
 import com.ruoyi.common.core.domain.entity.SysRole;
 import com.ruoyi.common.enums.SensitiveStrategy;
-import com.ruoyi.common.xss.Xss;
 import com.ruoyi.system.domain.vo.OpenAccountVO;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.validation.constraints.*;
+import javax.validation.constraints.Email;
+import javax.validation.constraints.Size;
 import java.util.Date;
 import java.util.List;
 
@@ -36,7 +39,7 @@ public class OpenAccount {
     /**
      * 用户Id
      */
-    @TableId(value = "user_id",type = IdType.ASSIGN_ID)
+    @TableId(value = "user_id", type = IdType.ASSIGN_ID)
     private Long userId;
 
     /**
@@ -176,7 +179,7 @@ public class OpenAccount {
     }
 
     public OpenAccount(OpenAccountVO openAccountVO) {
-        this.uId = openAccountVO.getU_id();
+        this.uId = openAccountVO.getUId();
         this.userName = openAccountVO.getUserName();
         this.nickName = openAccountVO.getNickName();
         this.phonenumber = openAccountVO.getPhonenumber();

ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/OpenAccountVO.java

@@ -17,11 +17,11 @@ public class OpenAccountVO implements Serializable {
     /**
      * 统一用户id（uId不懂为什么用不了）
      */
-//    @NotBlank(message = "uId不能为空")
-//    private Long uId;
+    @NotNull(message = "uId不能为空")
+    private Long uId;
 
-    @NotNull(message = "u_id不能为空")
-    private Long u_id;
+//    @NotNull(message = "u_id不能为空")
+//    private Long u_id;
 
     /**
      * 用户账号
@@ -59,7 +59,6 @@ public class OpenAccountVO implements Serializable {
     /**
      * 密码
      */
-    @NotBlank(message = "密码不能为空")
     private String password;
     /**
      * 角色列表

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/IUserinfoServiceImpl.java

@@ -68,7 +68,7 @@ public class IUserinfoServiceImpl implements IUserinfoService {
     @Override
     public void disableUser(OpenAccountVO openAccountVO) {
         UpdateWrapper<OpenAccount> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("u_id",openAccountVO.getU_id());
+        updateWrapper.eq("u_id",openAccountVO.getUId());
         updateWrapper.set("delFlag",2);
         iUserinfoMapper.update(null,updateWrapper);
     }
@@ -80,14 +80,14 @@ public class IUserinfoServiceImpl implements IUserinfoService {
         //判断u_id 和 用户名称是否存在
         QueryWrapper<OpenAccount> queryWrapper = new QueryWrapper<>();
         queryWrapper.select("u_id","user_name");
-        queryWrapper.eq("u_id",openAccountVO.getU_id());
+        queryWrapper.eq("u_id",openAccountVO.getUId());
         queryWrapper.or();
         queryWrapper.eq("user_name",openAccountVO.getUserName());
         List<OpenAccount> openAccounts = iUserinfoMapper.selectList(queryWrapper);
         if (!openAccounts.isEmpty()){
             if (openAccounts.size() == 2)
                 return "u_id、userName已存在";
-            else if (openAccounts.get(0).getUId() == openAccountVO.getU_id())
+            else if (openAccounts.get(0).getUId() == openAccountVO.getUId())
                 return "u_id已存在";
             else
                 return "userName已存在";

ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -7,6 +7,7 @@
     <resultMap type="SysUser" id="SysUserResult">
         <id property="userId" column="user_id"/>
         <result property="deptId" column="dept_id"/>
+        <result property="uId" column="u_id"/>
         <result property="userName" column="user_name"/>
         <result property="nickName" column="nick_name"/>
         <result property="userType" column="user_type"/>