fix: 请求入参非空校验修改

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/req/BatchEnableUserReq.java

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.util.List;
 
@@ -17,7 +18,7 @@ import java.util.List;
 @ApiModel
 public class BatchEnableUserReq implements Serializable {
 
-    @NotEmpty(message = "用户id列表为空")
+    @NotNull(message = "用户id列表为空")
     @ApiModelProperty(value = "用户id列表")
     private List<Long> ids;
 

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/req/GetUserInfoReq.java

@@ -4,7 +4,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 
 /**
@@ -15,10 +15,9 @@ import java.io.Serializable;
 @ApiModel
 public class GetUserInfoReq implements Serializable {
 
-  @NotEmpty(message = "用户id为空")
-  @ApiModelProperty(value = "用户id")
-  private Long id;
-
+    @NotNull(message = "用户id为空")
+    @ApiModelProperty(value = "用户id")
+    private Long id;
 
 
 }

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/req/ResetPasswordReq.java

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 
 /**
@@ -15,7 +16,7 @@ import java.io.Serializable;
 @Data
 @ApiModel
 public class ResetPasswordReq implements Serializable {
-    @NotEmpty(message = "用户id为空")
+    @NotNull(message = "用户id为空")
     @ApiModelProperty(value = "用户id")
     private Long id;
 

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/req/UpdatePasswordReq.java

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 
 /**
@@ -16,7 +17,7 @@ import java.io.Serializable;
 @ApiModel
 public class UpdatePasswordReq implements Serializable {
 
-    @NotEmpty(message = "用户id为空")
+    @NotNull(message = "用户id为空")
     @ApiModelProperty(value = "用户id")
     private Long id;
 

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/req/UpdateUserReq.java

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 
 /**
@@ -15,7 +16,7 @@ import java.io.Serializable;
 @ApiModel
 public class UpdateUserReq implements Serializable {
 
-  @NotEmpty(message = "用户id为空")
+  @NotNull(message = "用户id为空")
   @ApiModelProperty(value = "用户id")
   private Long id;
 

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/req/UserInfoIdReq.java

@@ -4,7 +4,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 
 /**
@@ -15,7 +15,7 @@ import java.io.Serializable;
 @ApiModel
 public class UserInfoIdReq implements Serializable {
 
-    @NotEmpty(message = "用户id为空")
+    @NotNull(message = "用户id为空")
     @ApiModelProperty(value = "用户id")
     private Long id;
 }

abi-cloud-qr-platform-server/src/main/resources/dao/mapper/UserRoleMapper.xml

@@ -64,20 +64,20 @@
         from user_role r
         <where>
             <!-- 仅可以查看当前角色树下的角色 -->
-            <if test="roleLevel==1">
-                and r.l1_role_code=#{roleCode}
+            <if test="role.roleLevel==1">
+                and r.l1_role_code=#{role.roleCode}
             </if>
-            <if test="roleLevel==2">
-                and r.l2_role_code=#{roleCode}
+            <if test="role.roleLevel==2">
+                and r.l2_role_code=#{role.roleCode}
             </if>
-            <if test="roleLevel==3">
-                and r.l3_role_code=#{roleCode}
+            <if test="role.roleLevel==3">
+                and r.l3_role_code=#{role.roleCode}
             </if>
-            <if test="roleLevel==4">
-                and r.l4_role_code=#{roleCode}
+            <if test="role.roleLevel==4">
+                and r.l4_role_code=#{role.roleCode}
             </if>
-            <if test="roleLevel==5">
-                and r.l5_role_code=#{roleCode}
+            <if test="role.roleLevel==5">
+                and r.l5_role_code=#{role.roleCode}
             </if>
         </where>
     </select>