fix 注册认证

ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java

@@ -88,7 +88,7 @@ public class AuthController {
         // 授权类型和客户端id
         String clientId = loginBody.getClientId();
         String grantType = loginBody.getGrantType();
-        String clientKey = loginBody.getClientKey();
+        //String clientKey = loginBody.getClientKey();
         SysClientVo client = clientService.queryByClientId(clientId);
         // 查询不到 client 或 client 内不包含 grantType
         if (ObjectUtil.isNull(client) || !StringUtils.contains(client.getGrantType(), grantType)) {

ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/service/impl/ResidentInfoServiceImpl.java

@@ -335,7 +335,10 @@ public class ResidentInfoServiceImpl implements IResidentInfoService {
                 }
             }
             String userType = sysUserVo.getUserType();
-            user.setUserType(userType+","+APP_USER);
+            if (!userType.contains(APP_USER.getUserType())) {
+                userType = userType+ "," + APP_USER.getUserType();
+            }
+            user.setUserType(userType);
             userService.updateUserByIdNoTenantId(user);
         }
         add.setExamine(TWO);
@@ -499,7 +502,10 @@ public class ResidentInfoServiceImpl implements IResidentInfoService {
                 SysUserVo sysUserVo = userService.selectUserById(userId);
                 //查询该用户的用户类型
                 String userType = sysUserVo.getUserType();
-                sysUser.setUserType(userType+","+APP_USER);
+                if (!userType.contains(APP_USER.getUserType())) {
+                    userType = userType+ "," + APP_USER.getUserType();
+                }
+                sysUser.setUserType(userType);
                 sysUser.setTenantId(tenantId);
                 //先去查询员工人员里面是否有认证通过的
                 List<StaffManageVo> infoListByUserId = staffManageMapper.getInfoListByUserId(userId);

ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/service/impl/StaffManageServiceImpl.java

@@ -243,7 +243,12 @@ public class StaffManageServiceImpl implements IStaffManageService {
                 });
                 userId = sysUserVo.getUserId();
                 String userType = sysUserVo.getUserType();
-                sysUser.setUserType(userType + "," + APP_STAFF.getUserType() + "," + PC_USER.getUserType());
+                if (!userType.contains(APP_STAFF.getUserType())) {
+                    userType = userType+ "," + APP_STAFF.getUserType();
+                }else if (!userType.contains(PC_USER.getUserType())) {
+                    userType = userType+ "," + PC_USER.getUserType();
+                }
+                sysUser.setUserType(userType);
                 //去查询居住人员里面是否有认证通过的
                 List<ResidentInfoVo> infoByUserId = residentInfoMapper.getInfoByUserId(userId);
                 if (infoByUserId != null && !infoByUserId.isEmpty()) {
@@ -404,7 +409,12 @@ public class StaffManageServiceImpl implements IStaffManageService {
                     }
                 }
                 String userType = sysUserVo.getUserType();
-                sysUser.setUserType(userType + "," + APP_STAFF.getUserType() + "," + PC_USER.getUserType());
+                if (!userType.contains(APP_STAFF.getUserType())) {
+                    userType = userType+ "," + APP_STAFF.getUserType();
+                }else if (!userType.contains(PC_USER.getUserType())) {
+                    userType = userType+ "," + PC_USER.getUserType();
+                }
+                sysUser.setUserType(userType);
                 userService.updateUserByIdNoTenantId(sysUser);
                 SysUserTenant sysUserTenant = new SysUserTenant();
                 sysUserTenant.setUserId(examineStaffManage.getUserId());