更新

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/org/UserAccountServiceImpl.java

@@ -2,6 +2,7 @@ package com.zhongshu.card.server.core.service.org;
 
 import com.github.microservice.auth.client.content.ResultState;
 import com.github.microservice.auth.client.model.UserAuthModel;
+import com.github.microservice.auth.client.model.UserModel;
 import com.github.microservice.auth.client.service.OrganizationUserService;
 import com.github.microservice.auth.client.service.RoleService;
 import com.github.microservice.auth.client.service.UserService;
@@ -260,12 +261,25 @@ public class UserAccountServiceImpl extends SuperService implements UserAccountS
                 passWord = cardNumber.substring(12, 18);
                 passWord = passWord.toLowerCase().replace("x", "0");
             }
-            //权限中心：添加用户
-            com.github.microservice.auth.client.content.ResultContent<String> addModelResult = userService.add(UserAuthModel.builder().loginType(LoginType.Phone).loginValue(loginName).passWord(passWord).build());
-            if (addModelResult.getState() != ResultState.Success) {
-                return ResultContent.buildFail(String.format("权限中心添加用户出错：%s", addModelResult.getMsg()));
+            String userId = "";
+            // 检查权限中心有这用户不
+            com.github.microservice.auth.client.content.ResultContent<UserModel> queryContent = userService.queryFromLoginType(LoginType.Phone, loginName);
+            if (queryContent.getState() == ResultState.Success) {
+                UserModel userModel = queryContent.getContent();
+                if (ObjectUtils.isNotEmpty(userModel)) {
+                    userId = userModel.getUserId();
+                }
             }
-            String userId = addModelResult.getContent();
+
+            if (StringUtils.isEmpty(userId)) {
+                //权限中心：添加用户
+                com.github.microservice.auth.client.content.ResultContent<String> addModelResult = userService.add(UserAuthModel.builder().loginType(LoginType.Phone).loginValue(loginName).passWord(passWord).build());
+                if (addModelResult.getState() != ResultState.Success) {
+                    return ResultContent.buildFail(String.format("权限中心添加用户出错：%s", addModelResult.getMsg()));
+                }
+                userId = addModelResult.getContent();
+            }
+
             userAccount = new UserAccount();
 
             BeanUtils.copyProperties(param, userAccount);

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

@@ -92,9 +92,12 @@ public class DeviceBindServiceImpl extends SuperService implements DeviceBindSer
             }
         } else {
             deviceBind = new DeviceBind();
-            if (ObjectUtils.isNotEmpty(temp)) {
+            if (ObjectUtils.isNotEmpty(temp) && ObjectUtils.isNotEmpty(temp.getDeviceInfo())) {
                 return ResultContent.buildFail(String.format("设备已添加：%s", deviceId));
             }
+            if (ObjectUtils.isNotEmpty(temp)) {
+                deviceBind = temp;
+            }
         }
         BeanUtils.copyProperties(param, deviceBind);
 

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

@@ -289,6 +289,7 @@ public class SchoolUserServiceImpl extends SuperService implements SchoolUserSer
         if (!ValidateUtils.isIDCard(cardNumber)) {
             return ResultContent.buildFail("身份证号码格式不正确");
         }
+
         // 注册用户
         RegisterUserAccountParam addParam = new RegisterUserAccountParam();
         BeanUtils.copyProperties(param, addParam);