修改审核角色bug

research-admin/src/main/java/com/research/web/controller/client/project/MemberAduitController.java

@@ -5,7 +5,10 @@ import com.github.pagehelper.PageInfo;
 import com.research.common.annotation.Anonymous;
 import com.research.common.core.domain.BaseDto;
 import com.research.common.core.domain.JsonResponse;
+import com.research.common.utils.SecurityUtils;
+import com.research.framework.datasource.DynamicDataSourceContextHolder;
 import com.research.system.domain.dto.MemberAduitDto;
+import com.research.system.domain.po.TmsTenantUser;
 import com.research.system.domain.vo.MemberAduitVo;
 import com.research.system.service.MemberAduitService;
 import io.swagger.annotations.Api;
@@ -18,6 +21,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import java.util.Date;
 import java.util.List;
 
 /**

research-admin/src/main/java/com/research/web/controller/system/SysUserController.java

@@ -153,22 +153,22 @@ public class SysUserController extends BaseController
         user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
         int i = userService.insertUser(user);
 
-        DynamicDataSourceContextHolder.setDataSourceType("MASTER");
-        TmsTenantUser tmsTenantUser = new TmsTenantUser();
-        tmsTenantUser.setTenantId(SecurityUtils.getTenantId());
-        tmsTenantUser.setTenantUserId(user.getUserId());
-        tmsTenantUser.setUserName(user.getUserName());
-        tmsTenantUser.setNickName(user.getNickName());
-        tmsTenantUser.setEmail(user.getEmail());
-        tmsTenantUser.setPhonenumber(user.getPhonenumber());
-        tmsTenantUser.setSex(user.getSex());
-        tmsTenantUser.setId(user.getUserId());
-        tmsTenantUser.setTenantUserId(user.getUserId());
-        tmsTenantUser.setDelFlag((byte) 0);
-        tmsTenantUser.setCreateTime(new Date());
-        tmsTenantUser.setCreateBy(getUsername());
-        tmsTenantUserMapper.insertSelective(tmsTenantUser);
-        DynamicDataSourceContextHolder.clearDataSourceType();
+//        DynamicDataSourceContextHolder.setDataSourceType("MASTER");
+//        TmsTenantUser tmsTenantUser = new TmsTenantUser();
+//        tmsTenantUser.setTenantId(SecurityUtils.getTenantId());
+//        tmsTenantUser.setTenantUserId(user.getUserId());
+//        tmsTenantUser.setUserName(user.getUserName());
+//        tmsTenantUser.setNickName(user.getNickName());
+//        tmsTenantUser.setEmail(user.getEmail());
+//        tmsTenantUser.setPhonenumber(user.getPhonenumber());
+//        tmsTenantUser.setSex(user.getSex());
+//        tmsTenantUser.setId(user.getUserId());
+//        tmsTenantUser.setTenantUserId(user.getUserId());
+//        tmsTenantUser.setDelFlag((byte) 0);
+//        tmsTenantUser.setCreateTime(new Date());
+//        tmsTenantUser.setCreateBy(getUsername());
+//        tmsTenantUserMapper.insertSelective(tmsTenantUser);
+//        DynamicDataSourceContextHolder.clearDataSourceType();
         return toAjax(i);
     }
 

research-admin/src/main/java/com/research/web/controller/tenant/TmsLoginController.java

@@ -26,6 +26,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -47,6 +48,8 @@ public class TmsLoginController {
     @Resource
     private TmsLoginService dmsLoginService;
 
+
+
     /**
      * 登录方法
      *
@@ -55,7 +58,6 @@ public class TmsLoginController {
      */
     @Anonymous
     @PostMapping("/login")
-    @DataSource(DataSourceType.MASTER)
     public AjaxResult login(@RequestBody LoginBody loginBody) {
         AjaxResult ajax = AjaxResult.success();
         // 生成令牌
@@ -153,4 +155,10 @@ public class TmsLoginController {
     public JsonResponse<TmsTenant> queryTenantById(@RequestBody TmsLoginUserVo.Query dto){
         return JsonResponse.ok(dmsLoginService.queryById(dto.getId()));
     }
+
+    @Anonymous
+    @PostMapping("/query")
+    public JsonResponse<List<TmsTenant>> query(){
+        return JsonResponse.ok(dmsLoginService.query());
+    }
 }

research-system/src/main/java/com/research/system/service/MemberAduitService.java

@@ -2,6 +2,7 @@ package com.research.system.service;
 
 import com.research.system.domain.dto.MemberAduitDto;
 import com.research.system.domain.po.KtsKtGroupMemberAduit;
+import com.research.system.domain.po.TmsTenantUser;
 import com.research.system.domain.vo.MemberAduitVo;
 
 import java.util.List;

research-system/src/main/java/com/research/system/service/TmsLoginService.java

@@ -5,6 +5,8 @@ import com.research.system.domain.dto.TmsTenantUserDto;
 import com.research.system.domain.po.TmsTenant;
 import com.research.system.domain.vo.TmsLoginUserVo;
 
+import java.util.List;
+
 /**
  * @Author zzc
  * @Package com.acupuncture.system.service
@@ -43,4 +45,6 @@ public interface TmsLoginService {
     TmsTenant queryById(Long id);
 
     TmsLoginUserVo.DmsUserVo selectTenantUserById(Long userId);
+
+    List<TmsTenant> query();
 }

research-system/src/main/java/com/research/system/service/TmsTenantUserService.java

@@ -1,5 +1,7 @@
 package com.research.system.service;
 
+import com.research.common.annotation.DataSource;
+import com.research.common.enums.DataSourceType;
 import com.research.system.domain.dto.TmsTenantUserDto;
 import com.research.system.domain.po.SrvDataSource;
 import com.research.system.domain.po.TmsTenantUser;
@@ -29,4 +31,7 @@ public interface TmsTenantUserService {
 
     TmsTenantUser queryByTenantUserId(Long tenantUserId);
 
+    @DataSource(DataSourceType.MASTER)
+    void insert(TmsTenantUser tmsTenantUser);
+
 }

research-system/src/main/java/com/research/system/service/impl/KtsGroupServiceImpl.java

@@ -19,6 +19,7 @@ import com.research.system.persist.mapper.KtsKtGroupMemberMapper;
 import com.research.system.service.ClientPrjProjInfoService;
 import com.research.system.service.ISysUserService;
 import com.research.system.service.KtsGroupService;
+import com.research.system.service.TmsTenantUserService;
 import org.springframework.context.annotation.Bean;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
@@ -49,6 +50,7 @@ public class KtsGroupServiceImpl implements KtsGroupService {
     @Resource
     private KtsGroupDao ktsGroupDao;
 
+
     @Override
     public List<GroupVO.Result> queryGroupList(GroupDto.Query query) {
         return ktsGroupDao.queryGroupList(query);

research-system/src/main/java/com/research/system/service/impl/MemberAduitServiceImpl.java

@@ -12,6 +12,7 @@ import com.research.system.domain.dto.MemberAduitDto;
 import com.research.system.domain.po.KtsKtGroupMemberAduit;
 import com.research.system.domain.po.KtsKtGroupMemberAduitExample;
 import com.research.system.domain.po.SrvMessage;
+import com.research.system.domain.po.TmsTenantUser;
 import com.research.system.domain.vo.MemberAduitVo;
 import com.research.system.persist.dao.MemberAduitDao;
 import com.research.system.persist.mapper.KtsKtGroupMemberAduitMapper;
@@ -19,12 +20,14 @@ import com.research.system.persist.mapper.SrvMessageMapper;
 import com.research.system.service.ISysUserService;
 import com.research.system.service.KtsGroupService;
 import com.research.system.service.MemberAduitService;
+import com.research.system.service.TmsTenantUserService;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -49,6 +52,8 @@ public class MemberAduitServiceImpl implements MemberAduitService {
     private SrvMessageMapper srvMessageMapper;
     @Resource
     private KtsGroupService ktsGroupService;
+    @Resource
+    private TmsTenantUserService tmsTenantUserService;
 
     @Override
     public void register(MemberAduitDto.Register dto) {
@@ -68,7 +73,7 @@ public class MemberAduitServiceImpl implements MemberAduitService {
         }
         List<Long> reviewerList = new ArrayList<>();
         //2.查询该合作单位负责人角色的人  发送审核消息
-        if (dto.getKtGroupId() != null || dto.getParentKtId()!=null) {
+        if (dto.getKtGroupId() != null || dto.getParentKtId() != null) {
             //101	合作单位负责人
             //102	项目负责人
             reviewerList = memberAduitDao.queryMemberIdList(dto.getProjOrgId(), 101L);
@@ -98,7 +103,7 @@ public class MemberAduitServiceImpl implements MemberAduitService {
     public void aduit(Long id, Byte status) {
         KtsKtGroupMemberAduit ktsKtGroupMemberAduit = ktsKtGroupMemberAduitMapper.selectByPrimaryKey(id);
         if (ktsKtGroupMemberAduit == null) {
-            return;
+            return ;
         }
         ktsKtGroupMemberAduit.setStatus(status);
         ktsKtGroupMemberAduit.setReviewedTime(new Date());
@@ -114,9 +119,8 @@ public class MemberAduitServiceImpl implements MemberAduitService {
             if (CollUtil.isEmpty(list)) {
                 throw new BaseException("未查询到项目负责人信息");
             }
-            ktsKtGroupMemberAduit.setRoleIdList(list.stream().map(String::valueOf).collect(Collectors.joining(",")));
             ktsKtGroupMemberAduit.setReviewedPersion(null);
-            ktsKtGroupMemberAduit.setReviewedTime( null);
+            ktsKtGroupMemberAduit.setReviewedTime(null);
             ktsKtGroupMemberAduit.setStatus((byte) 0);
             ktsKtGroupMemberAduitMapper.insertSelective(ktsKtGroupMemberAduit);
             //添加消息
@@ -128,13 +132,26 @@ public class MemberAduitServiceImpl implements MemberAduitService {
             srvMessage.setReceiver(list.stream().map(String::valueOf).collect(Collectors.joining(",")));
             srvMessageMapper.insertSelective(srvMessage);
 
-        }else {
+        } else {
             //审核成功， 添加成员
             GroupDto.AddMember addMember = new GroupDto.AddMember();
+            if (StrUtil.isNotEmpty(ktsKtGroupMemberAduit.getRoleIdList())) {
+                String[] split = ktsKtGroupMemberAduit.getRoleIdList().split(",");
+                addMember.setRoleIdList(Arrays.stream(split).map(Long::parseLong).collect(Collectors.toList()));
+            }
             BeanUtil.copyProperties(ktsKtGroupMemberAduit, addMember);
             ktsGroupService.addMember(addMember);
-        }
 
+//            //添加主库租户用户
+//            TmsTenantUser tmsTenantUser = new TmsTenantUser();
+//            tmsTenantUser.setCreateBy(SecurityUtils.getUsername());
+//            tmsTenantUser.setCreateTime(new Date());
+//            tmsTenantUser.setDelFlag((byte) 0);
+//            tmsTenantUser.setPhonenumber(ktsKtGroupMemberAduit.getMemberPhone());
+//            tmsTenantUser.setUserName(ktsKtGroupMemberAduit.getUsername());
+//            tmsTenantUserService.insert(tmsTenantUser);
+        }
+        return;
     }
 
     @Override

research-system/src/main/java/com/research/system/service/impl/TmsLoginServiceImpl.java

@@ -3,6 +3,7 @@ package com.research.system.service.impl;
 import com.research.common.core.domain.entity.SysUser;
 import com.research.system.domain.dto.TmsTenantUserDto;
 import com.research.system.domain.po.TmsTenant;
+import com.research.system.domain.po.TmsTenantExample;
 import com.research.system.domain.vo.TmsLoginUserVo;
 import com.research.system.mapper.SysUserMapper;
 import com.research.system.persist.dao.TmsUserDao;
@@ -12,6 +13,7 @@ import com.research.system.service.TmsLoginService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.List;
 
 /**
  * @Author zzc
@@ -68,4 +70,11 @@ public class TmsLoginServiceImpl implements TmsLoginService {
     public TmsLoginUserVo.DmsUserVo selectTenantUserById(Long userId) {
         return tmsUserDao.queryTenantUserById(userId);
     }
+
+    @Override
+    public List<TmsTenant> query() {
+        TmsTenantExample tmsTenantExample = new TmsTenantExample();
+        tmsTenantExample.createCriteria().andDelFlagEqualTo((byte) 0);
+        return tmsTenantMapper.selectByExample(tmsTenantExample);
+    }
 }

research-system/src/main/java/com/research/system/service/impl/TmsTenantUserServiceImpl.java

@@ -1,6 +1,7 @@
 package com.research.system.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.IdUtil;
 import com.research.system.domain.dto.TmsTenantUserDto;
 import com.research.system.domain.po.*;
 import com.research.system.domain.vo.AdminTenantUserVo;
@@ -73,4 +74,10 @@ public class TmsTenantUserServiceImpl implements TmsTenantUserService {
         }
         return null;
     }
+
+    @Override
+    public void insert(TmsTenantUser tmsTenantUser) {
+        tmsTenantUser.setId(IdUtil.getSnowflakeNextId());
+        tmsTenantUserMapper.insertSelective(tmsTenantUser);
+    }
 }