更新

FullCardClient/src/main/java/com/zhongshu/card/client/model/org/RegisterUserAccountParam.java

@@ -3,6 +3,7 @@ package com.zhongshu.card.client.model.org;
 import com.zhongshu.card.client.type.Sex;
 import com.zhongshu.card.client.type.UserType;
 import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.Size;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -20,6 +21,7 @@ import org.hibernate.internal.build.AllowPrintStacktrace;
 public class RegisterUserAccountParam {
 
     @Schema(description = "用户手机号")
+    @NotEmpty(message = "phone不能为空")
     private String phone;
 
     @Schema(description = "昵称")
@@ -29,7 +31,6 @@ public class RegisterUserAccountParam {
     private String realName;
 
     @Schema(description = "证件号码")
-
     private String cardNumber;
 
     @Schema(description = "学号/工号")

FullCardClient/src/main/java/com/zhongshu/card/client/model/school/RegisterBindSchoolParam.java

@@ -28,7 +28,7 @@ public class RegisterBindSchoolParam {
     @Schema(description = "部门ID")
     private String departmentId;
 
-    @Schema(description = "")
+    @Schema(description = "角色ID列表")
     @Hidden
     private List<String> roleIds = new ArrayList<>();
 }

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/school/SchoolUserServiceImpl.java

@@ -389,7 +389,13 @@ public class SchoolUserServiceImpl extends SuperService implements SchoolUserSer
         if (!ValidateUtils.isIDCard(cardNumber)) {
             return ResultContent.buildFail("身份证号码格式不正确");
         }
-
+        String loginName = param.getPhone();
+        UserAccount temp = userCountDao.findTopByLoginName(loginName);
+        if (ObjectUtils.isNotEmpty(temp)) {
+            if (StringUtils.isNotEmpty(temp.getCardNumber()) && !temp.getCardNumber().equals(param.getCardNumber())) {
+                return ResultContent.buildFail(String.format("用户已存在，证件号码不匹配"));
+            }
+        }
         // 注册用户
         RegisterUserAccountParam addParam = new RegisterUserAccountParam();
         BeanUtils.copyProperties(param, addParam);