联调

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/miniprogress/impl/WeChatUserServiceImpl.java

@@ -1,15 +1,19 @@
 package com.ruoyi.wisdomarbitrate.service.miniprogress.impl;
 
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.StrUtil;
 import com.ruoyi.common.constant.CacheConstants;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.entity.SysRole;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.redis.RedisCache;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.SmsUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.spring.SpringUtils;
+import com.ruoyi.system.mapper.SysRoleMapper;
 import com.ruoyi.system.mapper.SysUserMapper;
+import com.ruoyi.system.mapper.SysUserRoleMapper;
 import com.ruoyi.wisdomarbitrate.domain.dto.miniprogress.IdentityAuthentication;
 import com.ruoyi.wisdomarbitrate.domain.vo.miniprogress.WeChatUserVO;
 import com.ruoyi.wisdomarbitrate.mapper.miniprogress.IdentityAuthenticationMapper;
@@ -18,6 +22,8 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Objects;
 import java.util.Random;
 import java.util.concurrent.TimeUnit;
 
@@ -32,6 +38,10 @@ public class WeChatUserServiceImpl implements WeChatUserService {
     @Autowired
     private SysUserMapper sysUserMapper;
     @Autowired
+    private SysRoleMapper roleMapper;
+    @Autowired
+    private SysUserRoleMapper userRoleMapper;
+    @Autowired
     private IdentityAuthenticationMapper identityAuthenticationMapper;
 
     @Override
@@ -112,6 +122,11 @@ public class WeChatUserServiceImpl implements WeChatUserService {
 
         // 根据身份证查询系统用户表中是否存在该用户，存在则同步已认证的信息，不存在则新增
         SysUser sysUser=sysUserMapper.selectUserByIdCard(ientityAuthentication.getIdentityNo());
+        // 查询角色
+        Long roleIdByName = roleMapper.selectRoleIdByName("被申请人");
+        if(roleIdByName==null){
+            return AjaxResult.warn("被申请人角色不存在，请联系系统管理员新增角色");
+        }
         if(sysUser!=null){
             sysUser.setIdCard(ientityAuthentication.getIdentityNo());
             sysUser.setNickName(ientityAuthentication.getName());
@@ -121,6 +136,21 @@ public class WeChatUserServiceImpl implements WeChatUserService {
             sysUser.setPassword(SecurityUtils.encryptPassword(ientityAuthentication.getPassWord()));
             sysUserMapper.updateUser(sysUser);
             ientityAuthentication.setUserId(sysUser.getUserId());
+            int count=0;
+           if(CollectionUtil.isNotEmpty(sysUser.getRoles()) ){
+
+               for (SysRole role : sysUser.getRoles()) {
+                   if(Objects.equals(role.getRoleId(), roleIdByName)){
+                       count++;
+                       break;
+                   }
+               }
+           }
+           if(CollectionUtil.isEmpty(sysUser.getRoles())||count==0){
+                   // 用户未关联被申请人角色，关联角色
+                   userRoleMapper.insertUserRole(sysUser.getUserId(), roleIdByName);
+           }
+
         }else {
             sysUser=new SysUser();
             sysUser.setIdCard(ientityAuthentication.getIdentityNo());
@@ -134,12 +164,15 @@ public class WeChatUserServiceImpl implements WeChatUserService {
             if(row<1) {
                 return AjaxResult.warn("注册失败");
             }
+            // 用户关联被申请人角色
+            userRoleMapper.insertUserRole(sysUser.getUserId(), roleIdByName);
         }
 
         ientityAuthentication.setUserId(sysUser.getUserId());
         ientityAuthentication.setUserName(sysUser.getUserName());
         // 已经认证过的用户才能注册,认证表中已经有该数据
         identityAuthenticationMapper.updateIdentityAuthentication(ientityAuthentication);
+        // 查询角色
         return AjaxResult.success("注册成功");
     }