update

1. 修改测试bug

commons/src/main/java/com/jzg/commons/constants/RedisKeyConstants.java

@@ -35,5 +35,9 @@ public class RedisKeyConstants {
      */
     public static final long VIN_SEARCH_KEY_TIME = 1L;
 
+    /**
+     * app租户登录code
+     */
+    public static final String APP_SYSTEM_CODE = "app:system-code:";
 
 }

commons/src/main/java/com/jzg/commons/entity/user/vo/SysTennatVo.java

@@ -14,4 +14,7 @@ public class SysTennatVo {
     private String deptName;
 
     private String iconAddress;
+
+    private boolean defaultValue;
+
 }

platform/src/main/java/com/jzg/controller/ClauseController.java

@@ -41,6 +41,9 @@ public class ClauseController {
     @PostMapping(value = "getClausePage")
     public HttpResult<Page<InsCompanyClauseVo>> getClausePage(@RequestBody CompanyClauseVo companyClauseVo){
         Page page = companyClauseVo.getPage();
+        if("all".equals(companyClauseVo.getRiskCode())){
+            companyClauseVo.setRiskCode("");
+        }
         return HttpResult.ok(insCompanyClauseService.getClausePage(page,companyClauseVo));
     }
 

tenant/organization/src/main/java/com/jzg/organization/controller/DictController.java

@@ -34,23 +34,17 @@ import static com.jzg.commons.constants.RedisKeyConstants.DICT_REDIS_KEY;
 @RequestMapping("/dict")
 public class DictController {
 
-    @Autowired
-    private SysDictMapper sysDictMapper;
-
     @Autowired
     private SysDictService sysDictService;
 
-    @Autowired
-    private SysDictTypeMapper sysDictTypeMapper;
-
     @Autowired
     RedissonClient redissonClient;
 
     @GetMapping("/get")
     @Operation(summary = "获取字典", description = "获取字典")
     public HttpResult addDept(String dictCode,String parentValue) {
-        List<SysDict> list = redissonClient.getList(DICT_REDIS_KEY + dictCode);
-        List<SysDict> newResult = new ArrayList<>();
+        List<SysDict> list = sysDictService.getByTypeCode(dictCode);
+        List<SysDict> newResult;
         if(Objects.nonNull(parentValue)){
             newResult = list.stream().filter(x -> x.getParentValue().equals(parentValue)).collect(Collectors.toList());
         }else{

tenant/organization/src/main/java/com/jzg/organization/controller/UserController.java

@@ -165,6 +165,13 @@ public class UserController extends BaseController {
         return HttpResult.ok(sysUserService.getTenantList(getUserName()));
     }
 
+    @GetMapping("/setTenantList/{systemCode}")
+    @Operation(summary = "设置默认租户",description = "设置默认租户")
+    public HttpResult setTenantList(@PathVariable String systemCode){
+        sysUserService.setTenantList(systemCode, getUserName());
+        return HttpResult.ok();
+    }
+
     @Operation(summary = "通过电话获取业务员",description = "通过电话获取用户")
     @GetMapping(value = "/getUserByMobile")
     public SalesmanVo getUserByMobile(@RequestParam String mobile){

tenant/organization/src/main/java/com/jzg/organization/service/SysDictService.java

@@ -35,4 +35,11 @@ public interface SysDictService extends IService<SysDict> {
      * @return
      */
     HttpResult deleteDict(SysDictVo sysDictVo);
+
+    /**
+     * 通过字典类型编码获取字典列表
+     * @param typeCode 字典类型编码
+     * @return 字典列表
+     */
+    List<SysDict> getByTypeCode(String typeCode);
 }

tenant/organization/src/main/java/com/jzg/organization/service/SysUserService.java

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.jzg.commons.core.page.HttpResult;
 import com.jzg.commons.entity.dto.SysUserInfoParam;
 import com.jzg.commons.entity.dto.SysUserJzgInfoDto;
-import com.jzg.commons.entity.po.SysSystem;
 import com.jzg.commons.entity.po.SysUser;
 import com.jzg.commons.entity.user.vo.SysTennatVo;
 import com.jzg.commons.entity.vo.*;
@@ -23,14 +22,17 @@ public interface SysUserService extends IService<SysUser> {
 
     /**
      * 获取人员信息
+     *
      * @param sysUserVo
      * @return
      */
     List<SysUserVo> getUserInfo(SysUserVo sysUserVo);
 
     HttpResult getUserSelect(SysUserInfoListVo sysUserInfoListVo);
+
     /**
      * 添加业务员
+     *
      * @param sysUserVo
      * @return
      */
@@ -52,6 +54,7 @@ public interface SysUserService extends IService<SysUser> {
 
     /**
      * 获取成员转移资源信息
+     *
      * @param userId
      * @return
      */
@@ -59,6 +62,7 @@ public interface SysUserService extends IService<SysUser> {
 
     /**
      * 成员资源转移
+     *
      * @param userTransferVo
      * @return
      */
@@ -66,6 +70,7 @@ public interface SysUserService extends IService<SysUser> {
 
     /**
      * 获取用户角色名称
+     *
      * @param userId
      * @return
      */
@@ -73,6 +78,7 @@ public interface SysUserService extends IService<SysUser> {
 
     /**
      * 用户离职申请
+     *
      * @param userId
      * @return
      */
@@ -80,6 +86,7 @@ public interface SysUserService extends IService<SysUser> {
 
     /**
      * 实名认证
+     *
      * @param userId
      * @return
      */
@@ -87,6 +94,7 @@ public interface SysUserService extends IService<SysUser> {
 
     /**
      * 实名认证审核失败
+     *
      * @param userId
      * @return
      */
@@ -94,6 +102,7 @@ public interface SysUserService extends IService<SysUser> {
 
     /**
      * 业务员审核成功
+     *
      * @param userInfoId
      * @return
      */
@@ -101,6 +110,7 @@ public interface SysUserService extends IService<SysUser> {
 
     /**
      * 业务员审核失败
+     *
      * @param auditSalesmanVo
      * @return
      */
@@ -114,21 +124,24 @@ public interface SysUserService extends IService<SysUser> {
 
     /**
      * 获取用户租户列表
+     *
      * @return
      */
     List<SysTennatVo> getTenantList(String userId);
 
     /**
      * 校验短信验证码
+     *
      * @param mobile
      * @param smsCode
      * @return
      */
-    boolean validateSmsCode(String mobile,String smsCode);
+    boolean validateSmsCode(String mobile, String smsCode);
 
 
     /**
      * 校验密码
+     *
      * @param mobile
      * @param password
      * @return
@@ -139,4 +152,11 @@ public interface SysUserService extends IService<SysUser> {
 
     SalesmanVo getUserInfoBySystemCodeAndUserId(String userId);
 
+    /**
+     * 设置默认租户
+     *
+     * @param systemCode 租户编码
+     * @param userId     用户id
+     */
+    void setTenantList(String systemCode, String userId);
 }

tenant/organization/src/main/java/com/jzg/organization/service/impl/SysDictServiceImpl.java

@@ -4,35 +4,45 @@ import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jzg.commons.core.page.HttpResult;
-import com.jzg.commons.entity.po.SysDept;
 import com.jzg.commons.entity.po.SysDict;
 import com.jzg.commons.entity.vo.SysDictVo;
-import com.jzg.commons.entity.vo.SysUserVo;
 import com.jzg.commons.exception.SystemException;
 import com.jzg.commons.util.AssertionUtils;
 import com.jzg.commons.util.StringUtils;
 import com.jzg.commons.util.idgen.IdGenerate;
 import com.jzg.organization.mapper.SysDictMapper;
 import com.jzg.organization.service.SysDictService;
+import lombok.RequiredArgsConstructor;
+import org.redisson.api.RList;
+import org.redisson.api.RedissonClient;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
-import java.util.*;
+import java.time.Duration;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
+import static com.jzg.commons.constants.RedisKeyConstants.DICT_REDIS_KEY;
+
 @Service
-public class SysDictServiceImpl  extends ServiceImpl<SysDictMapper, SysDict> implements SysDictService {
+@RequiredArgsConstructor
+public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> implements SysDictService {
 
+    private final RedissonClient redissonClient;
 
     @Override
     public List<SysDictVo> queryTree() {
         LambdaQueryWrapper<SysDict> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.in(SysDict::getTypeId,44,45);
-        queryWrapper.eq(SysDict::getIsDelete,0);
+        queryWrapper.in(SysDict::getTypeId, 44, 45);
+        queryWrapper.eq(SysDict::getIsDelete, 0);
         queryWrapper.orderByAsc(SysDict::getSort);
         List<SysDict> list = list(queryWrapper);
         List<SysDictVo> collect = list.stream().map(SysDictVo::new)
-                .sorted( (e1,e2) -> {
+                .sorted((e1, e2) -> {
                     return e1.getCreateTime().compareTo(e2.getCreateTime());
                 }).collect(Collectors.toList());
         Map<String, List<SysDictVo>> map = collect.stream().collect(Collectors.groupingBy(SysDictVo::getParentValue));
@@ -43,7 +53,7 @@ public class SysDictServiceImpl  extends ServiceImpl<SysDictMapper, SysDict> imp
     @Override
     public boolean addDict(SysDictVo sysDictVo) {
 
-        validateDict(sysDictVo,true);
+        validateDict(sysDictVo, true);
 
         SysDict sysDict = new SysDict();
         BeanUtils.copyProperties(sysDictVo, sysDict);
@@ -53,25 +63,25 @@ public class SysDictServiceImpl  extends ServiceImpl<SysDictMapper, SysDict> imp
         //获取父级id
         String parentId = sysDict.getParentValue();
         //设置机构路径
-        if(!parentId.equals("0") || StringUtils.isNotEmpty(parentId)) {
+        if (!parentId.equals("0") || StringUtils.isNotEmpty(parentId)) {
             SysDict parentSysDict = baseMapper.selectById(parentId);
-            if(!Objects.isNull(parentSysDict)){
+            if (!Objects.isNull(parentSysDict)) {
                 sysDict.setTypeId(parentSysDict.getTypeId());
                 sysDict.setTypeCode(parentSysDict.getTypeCode());
             }
 
             LambdaQueryWrapper<SysDict> queryWrapper = new LambdaQueryWrapper<>();
-            queryWrapper.eq(SysDict::getParentValue,parentId);
-            queryWrapper.eq(SysDict::getIsDelete,0);
+            queryWrapper.eq(SysDict::getParentValue, parentId);
+            queryWrapper.eq(SysDict::getIsDelete, 0);
             List<SysDict> dicts = this.list(queryWrapper);
-            sysDict.setSort(CollUtil.isEmpty(dicts)? "0" : dicts.size() + "");
+            sysDict.setSort(CollUtil.isEmpty(dicts) ? "0" : dicts.size() + "");
         }
         return this.save(sysDict);
     }
 
     @Override
     public boolean updateDict(SysDictVo sysDictVo) {
-        validateDict(sysDictVo,false);
+        validateDict(sysDictVo, false);
         SysDict sysDict = new SysDict();
         BeanUtils.copyProperties(sysDictVo, sysDict);
         return this.updateById(sysDict);
@@ -91,23 +101,39 @@ public class SysDictServiceImpl  extends ServiceImpl<SysDictMapper, SysDict> imp
         return HttpResult.ok("删除机构成功");
     }
 
-    private void validateDict(SysDictVo sysDictVo, boolean isAdd){
+    private void validateDict(SysDictVo sysDictVo, boolean isAdd) {
 
         AssertionUtils.isFail(StringUtils.isBlank(sysDictVo.getParentValue()), "父类id不能为空");
         AssertionUtils.isFail(StringUtils.isBlank(sysDictVo.getValue()), "类目名称不能为空");
-        if(isAdd){
-            if(this.count(new LambdaQueryWrapper<SysDict>()
-                    .eq(SysDict::getValue, sysDictVo.getValue())) > 0){
+        if (isAdd) {
+            if (this.count(new LambdaQueryWrapper<SysDict>()
+                    .eq(SysDict::getValue, sysDictVo.getValue())) > 0) {
                 throw new SystemException("类目名称已存在");
             }
-        }else{
+        } else {
             AssertionUtils.isFail(StringUtils.isBlank(sysDictVo.getId()), "编辑类目id不能为空");
-            if(this.count(new LambdaQueryWrapper<SysDict>()
+            if (this.count(new LambdaQueryWrapper<SysDict>()
                     .eq(SysDict::getValue, sysDictVo.getValue())
-                    .ne(SysDict::getId, sysDictVo.getId())) > 0){
+                    .ne(SysDict::getId, sysDictVo.getId())) > 0) {
                 throw new SystemException("类目名称已存在");
             }
         }
 
     }
+
+    @Override
+    public List<SysDict> getByTypeCode(String typeCode) {
+        RList<SysDict> list = redissonClient.getList(DICT_REDIS_KEY + typeCode);
+        if (CollectionUtils.isEmpty(list)) {
+            List<SysDict> sysDictList = lambdaQuery()
+                    .eq(SysDict::getTypeCode, typeCode)
+                    .orderByAsc(SysDict::getSort)
+                    .list();
+            list.addAll(sysDictList);
+            return sysDictList;
+        }
+        list.expire(Duration.ofHours(24));
+        return list;
+    }
+
 }

tenant/organization/src/main/java/com/jzg/organization/service/impl/SysUserServiceImpl.java

@@ -101,14 +101,14 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     @Autowired
     private SysMessageTemplateService messageTemplateService;
 
-    private String getCurrentAreaCode(String province,String city,String area){
+    private String getCurrentAreaCode(String province, String city, String area) {
         String userWorkNumber = "";
         if (!area.isEmpty()) {
             userWorkNumber += area;  // 使用县
         } else if (!city.isEmpty()) {
-            userWorkNumber += city.substring(0,4);  // 使用市
+            userWorkNumber += city.substring(0, 4);  // 使用市
         } else if (!province.isEmpty()) {
-            userWorkNumber += province.substring(0,2);  // 使用省
+            userWorkNumber += province.substring(0, 2);  // 使用省
         }
         return userWorkNumber;
     }
@@ -147,26 +147,26 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     }
 
     @Override
-    public HttpResult getUserSelect(SysUserInfoListVo sysUserInfoListVo){
+    public HttpResult getUserSelect(SysUserInfoListVo sysUserInfoListVo) {
         return HttpResult.ok(baseMapper.getUserSelect(sysUserInfoListVo));
     }
 
     @Override
     public Page<SysUserJzgInfoDto> getUserInfoList(Page page, SysUserInfoListVo sysUserInfoListVo) {
-        return sysUserJzgInfoMapper.getUserInfoList(page,sysUserInfoListVo);
+        return sysUserJzgInfoMapper.getUserInfoList(page, sysUserInfoListVo);
     }
 
     @Override
     public UserTransferInfoVo getTransferInfo(String userId) {
         SysUserJzgInfo userJzgInfo = sysUserJzgInfoService.getOne(new LambdaQueryWrapper<SysUserJzgInfo>()
-                .eq(SysUserJzgInfo::getUserId,userId));
+                .eq(SysUserJzgInfo::getUserId, userId));
         SysDept dept = sysDeptService.getById(userJzgInfo.getDeptId());
-        if(Objects.isNull(dept)){
+        if (Objects.isNull(dept)) {
             throw new SystemException("人员所属机构不存在");
         }
         long count = sysUserJzgInfoService.count(new LambdaQueryWrapper<SysUserJzgInfo>()
                 .eq(SysUserJzgInfo::getLeaderId, userId));
-        return new UserTransferInfoVo(userId,String.valueOf(count),dept.getName());
+        return new UserTransferInfoVo(userId, String.valueOf(count), dept.getName());
     }
 
     @Override
@@ -175,7 +175,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         //检查用户的业务员数量
         List<SysUserJzgInfo> list = sysUserJzgInfoService.list(new LambdaQueryWrapper<SysUserJzgInfo>()
                 .eq(SysUserJzgInfo::getLeaderId, originalUserId));
-        list.forEach(item->{
+        list.forEach(item -> {
             item.setLeaderId(userTransferVo.getTransferUserId());
         });
         return sysUserJzgInfoService.updateBatchById(list);
@@ -191,7 +191,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         SysUserJzgInfo userByUserId = sysUserJzgInfoService.getUserByUserId(userId);
         //离职申请状态机返回
         StateResult resign = userStateListener.ResignRequest(userByUserId);
-        if(resign.isResult()){
+        if (resign.isResult()) {
             //更新状态
             userByUserId.setStatus(UserState.UserStateEnum.RESIGN_ING.getValue());
             sysUserJzgInfoService.updateById(userByUserId);
@@ -200,10 +200,10 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     }
 
     @Override
-    public boolean realNameAuth(String userId){
+    public boolean realNameAuth(String userId) {
         SysUserJzgInfo userByUserId = sysUserJzgInfoService.getUserByUserId(userId);
         StateResult stateResult = userStateListener.AuthCert(userByUserId);
-        if(stateResult.isResult()){
+        if (stateResult.isResult()) {
             //更新状态
             userByUserId.setStatus(stateResult.getCurrentState());
             sysUserJzgInfoService.updateById(userByUserId);
@@ -241,9 +241,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         AuditCountVo auditCountVo = new AuditCountVo();
         LambdaQueryWrapper<SysUserJzgInfo> queryWrapper1 = new LambdaQueryWrapper<>();
         queryWrapper1.eq(StringUtils.isNotEmpty(sysUserInfoParam.getTypeAttr()), SysUserJzgInfo::getTypeAttr, sysUserInfoParam.getTypeAttr())
-                .eq(StringUtils.isNotEmpty(sysUserInfoParam.getDeptId()),SysUserJzgInfo::getDeptId, sysUserInfoParam.getDeptId())
-                .eq(SysUserJzgInfo::getIsDelete,0)
-                .eq(SysUserJzgInfo::getIsEnable,0)
+                .eq(StringUtils.isNotEmpty(sysUserInfoParam.getDeptId()), SysUserJzgInfo::getDeptId, sysUserInfoParam.getDeptId())
+                .eq(SysUserJzgInfo::getIsDelete, 0)
+                .eq(SysUserJzgInfo::getIsEnable, 0)
         ;
 
         queryWrapper1.eq(SysUserJzgInfo::getStatus, UserState.UserStateEnum.COMPANY_REVIEW_ING.getValue()); // 未审核
@@ -251,12 +251,12 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 
         LambdaQueryWrapper<SysUserJzgInfo> queryWrapper2 = new LambdaQueryWrapper<>();
         queryWrapper2.eq(StringUtils.isNotEmpty(sysUserInfoParam.getTypeAttr()), SysUserJzgInfo::getTypeAttr, sysUserInfoParam.getTypeAttr())
-                .eq(StringUtils.isNotEmpty(sysUserInfoParam.getDeptId()),SysUserJzgInfo::getDeptId, sysUserInfoParam.getDeptId())
-                .eq(SysUserJzgInfo::getIsDelete,0)
-                .eq(SysUserJzgInfo::getIsEnable,0)
+                .eq(StringUtils.isNotEmpty(sysUserInfoParam.getDeptId()), SysUserJzgInfo::getDeptId, sysUserInfoParam.getDeptId())
+                .eq(SysUserJzgInfo::getIsDelete, 0)
+                .eq(SysUserJzgInfo::getIsEnable, 0)
         ;
 
-        queryWrapper2.eq(SysUserJzgInfo::getStatus,UserState.UserStateEnum.COMPANY_REVIEW_FAILED.getValue()); // 审核失败
+        queryWrapper2.eq(SysUserJzgInfo::getStatus, UserState.UserStateEnum.COMPANY_REVIEW_FAILED.getValue()); // 审核失败
         Long failCount = sysUserJzgInfoService.count(queryWrapper2);
         auditCountVo.setNoAuditCount(noCount);
         auditCountVo.setFailAuditCount(failCount);
@@ -265,10 +265,15 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 
     @Override
     public List<SysTennatVo> getTenantList(String userId) {
+        // 租户id
+        String systemCode = (String) redissonClient.getBucket(RedisKeyConstants.APP_SYSTEM_CODE + userId).get();
         List<SysTennatVo> tenantList = sysUserJzgInfoMapper.getTenantList(userId);
-        tenantList.forEach(item->{
+        tenantList.forEach(item -> {
             String presignedObjectUrl = MinioUtils.getPresignedObjectUrl(bucketName, item.getSysIcon());
             item.setIconAddress(presignedObjectUrl);
+            if (StringUtils.hasText(systemCode) && item.getSystemCode().equals(systemCode)) {
+                item.setDefaultValue(true);
+            }
         });
         return tenantList;
     }
@@ -276,11 +281,11 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     @Override
     public boolean validateSmsCode(String mobile, String smsCode) {
         //校验短信验证码
-        if(Objects.isNull(redissonClient.getBucket(RedisKeyConstants.SMS_CODE + mobile).get())){
+        if (Objects.isNull(redissonClient.getBucket(RedisKeyConstants.SMS_CODE + mobile).get())) {
             throw new SystemException("短信验证码已过期");
         }
         String systemSmsCode = redissonClient.getBucket(RedisKeyConstants.SMS_CODE + mobile).get().toString();
-        if(!smsCode.equals(systemSmsCode)){
+        if (!smsCode.equals(systemSmsCode)) {
             throw new SystemException("短信验证码错误,请重新输入");
         }
         return true;
@@ -293,10 +298,10 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
                 .eq(SysUser::getIsDelete, 0);
         SysUser user = sysUserService.getOne(queryWrapper);
         // 加密密码和盐值
-        String encryptedPassword = PasswordUtils.encode(password,user.getSalt());
+        String encryptedPassword = PasswordUtils.encode(password, user.getSalt());
 
         //调试时候用 万能密码
-        if(!password.equals("Aa159357")) {
+        if (!password.equals("Aa159357")) {
             // 对比密码
             if (!encryptedPassword.equals(user.getPassword())) {
                 return false;
@@ -307,10 +312,10 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 
 
     @Override
-    public boolean realNameAuthFailed(String userId){
+    public boolean realNameAuthFailed(String userId) {
         SysUserJzgInfo userByUserId = sysUserJzgInfoService.getUserByUserId(userId);
         StateResult stateResult = userStateListener.AuthCertFailed(userByUserId);
-        if(stateResult.isResult()){
+        if (stateResult.isResult()) {
             //更新状态
             userByUserId.setStatus(stateResult.getCurrentState());
             sysUserJzgInfoService.updateById(userByUserId);
@@ -322,28 +327,28 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     @Transactional(rollbackFor = Exception.class)
     public HttpResult addUserInfo(SysUserVo sysUserVo) {
         SysUser sysUser = baseMapper.getUserByMobile(sysUserVo.getMobile());
-        String sysUserJzgInfoId = "",sysUserId = "";
+        String sysUserJzgInfoId = "", sysUserId = "";
         SysUserJzgInfo sysUserJzgInfo = new SysUserJzgInfo();
         if (!Objects.isNull(sysUser)) {
-            verifyUser(sysUserVo.getTypeAttr(),sysUserVo.getDeptId(),sysUserVo.getIdentity(),sysUser.getId(),sysUserVo.getLeaderId(),sysUserVo.getReferrerId(),sysUserVo.getMobile());
+            verifyUser(sysUserVo.getTypeAttr(), sysUserVo.getDeptId(), sysUserVo.getIdentity(), sysUser.getId(), sysUserVo.getLeaderId(), sysUserVo.getReferrerId(), sysUserVo.getMobile());
             BeanUtils.copyProperties(sysUserVo, sysUserJzgInfo);
             sysUserJzgInfo.setUserId(sysUser.getId());
             sysUserJzgInfoService.save(sysUserJzgInfo);
             // 同时添加为业务员
             if (sysUserVo.getIsAddSalesman() == 1) {
-                addSalesmanList(sysUserJzgInfo,sysUserVo);
+                addSalesmanList(sysUserJzgInfo, sysUserVo);
             }
             sysUserJzgInfoId = sysUserJzgInfo.getId();
             sysUserId = sysUser.getId();
             if (sysUserVo.getOrganizationId() != null && !sysUserVo.getOrganizationId().equals("")) {
                 saveOrganization(sysUserVo.getOrganizationId(), sysUserJzgInfo.getUserId());
             }
-            saveFile(sysUserVo.getSfz1(), sysUserVo.getSfz2(), sysUserVo.getQualification(), sysUserVo.getContract(), sysUserVo.getApplicant(), sysUserVo.getSalaryTable(), sysUserVo.getLeaveTable(),sysUserJzgInfo.getUserId());
+            saveFile(sysUserVo.getSfz1(), sysUserVo.getSfz2(), sysUserVo.getQualification(), sysUserVo.getContract(), sysUserVo.getApplicant(), sysUserVo.getSalaryTable(), sysUserVo.getLeaveTable(), sysUserJzgInfo.getUserId());
             //系统中已存在业务员
 //            throw new SystemException("用户信息已存在,无法添加");
         } else {
             // 如果手机号为新号 重新生成SysUser 设置默认密码
-            SysUser sysUser1 = new SysUser(sysUserVo.getMobile(),sysUserVo.getMobile(),sysUserVo.getIdentity(),sysUserVo.getIdentityTimeStart(),sysUserVo.getIdentityTimeEnd(),null);
+            SysUser sysUser1 = new SysUser(sysUserVo.getMobile(), sysUserVo.getMobile(), sysUserVo.getIdentity(), sysUserVo.getIdentityTimeStart(), sysUserVo.getIdentityTimeEnd(), null);
             this.save(sysUser1);
             BeanUtils.copyProperties(sysUserVo, sysUserJzgInfo);
             sysUserJzgInfo.setId(IdGenerate.nextId());
@@ -353,9 +358,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             sysUserJzgInfoService.save(sysUserJzgInfo);
             // 同时添加为业务员
             if (sysUserVo.getIsAddSalesman() == 1) {
-                addSalesmanList(sysUserJzgInfo,sysUserVo);
-            }else if(sysUserVo.getIsAddSalesman() == 0){
-                SysUserJzgInfoSalesman sysUserJzgInfoSalesman = new SysUserJzgInfoSalesman(sysUserJzgInfo.getId(),"2");
+                addSalesmanList(sysUserJzgInfo, sysUserVo);
+            } else if (sysUserVo.getIsAddSalesman() == 0) {
+                SysUserJzgInfoSalesman sysUserJzgInfoSalesman = new SysUserJzgInfoSalesman(sysUserJzgInfo.getId(), "2");
                 sysUserJzgInfoSalesmanService.save(sysUserJzgInfoSalesman);
             }
             // 直接添加业务员
@@ -368,29 +373,29 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             if (sysUserVo.getOrganizationId() != null && !sysUserVo.getOrganizationId().equals("")) {
                 saveOrganization(sysUserVo.getOrganizationId(), sysUserJzgInfo.getUserId());
             }
-            saveFile(sysUserVo.getSfz1(), sysUserVo.getSfz2(), sysUserVo.getQualification(), sysUserVo.getContract(), sysUserVo.getApplicant(), sysUserVo.getSalaryTable(), sysUserVo.getLeaveTable(),sysUserJzgInfo.getId());
+            saveFile(sysUserVo.getSfz1(), sysUserVo.getSfz2(), sysUserVo.getQualification(), sysUserVo.getContract(), sysUserVo.getApplicant(), sysUserVo.getSalaryTable(), sysUserVo.getLeaveTable(), sysUserJzgInfo.getId());
         }
 
         //如果表单输入的银行卡号和银行名不为空，则保存银行卡信息
         if (sysUserVo.getBankCardId() != null && sysUserVo.getBankName() != null) {
             SysUserJzgInfoBankCard sysUserJzgInfoBankCard =
-                    new SysUserJzgInfoBankCard(sysUserId, sysUserVo.getBankCardId(), sysUserVo.getBankName(),sysUserJzgInfo.getSystemCode());
+                    new SysUserJzgInfoBankCard(sysUserId, sysUserVo.getBankCardId(), sysUserVo.getBankName(), sysUserJzgInfo.getSystemCode());
             sysUserJzgInfoBankCardService.save(sysUserJzgInfoBankCard);
         }
         //如果角色存在的话则存储角色
-        if(!Objects.isNull(sysUserVo.getRoleIds()) && !sysUserVo.getRoleIds().isEmpty()){
+        if (!Objects.isNull(sysUserVo.getRoleIds()) && !sysUserVo.getRoleIds().isEmpty()) {
             String finalSysUserId = sysUserId;
             List<SysUserRole> sysUserRoleList = new ArrayList<>();
             sysUserVo.getRoleIds().forEach(roleId -> {
-                SysUserRole sysUserRole = new SysUserRole(finalSysUserId,roleId);
+                SysUserRole sysUserRole = new SysUserRole(finalSysUserId, roleId);
                 sysUserRoleList.add(sysUserRole);
             });
             sysUserRoleService.saveBatch(sysUserRoleList);
         }
         String resultMsg = "";
-        if(sysUserVo.getTypeAttr().equals("2")){
+        if (sysUserVo.getTypeAttr().equals("2")) {
             resultMsg = "添加成员成功";
-        }else{
+        } else {
             resultMsg = "添加业务员成功";
         }
 
@@ -398,7 +403,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         this.addUserMessage(baseController.getUserName(), sysUserJzgInfo, MessageCodeEnum.TEMPLATE_11);
         return HttpResult.ok(resultMsg);
     }
-    private void addSalesmanList(SysUserJzgInfo sysUserJzgInfo,SysUserVo sysUserVo) {
+
+    private void addSalesmanList(SysUserJzgInfo sysUserJzgInfo, SysUserVo sysUserVo) {
         List<SysUserJzgInfoSalesman> sysUserJzgInfoSalesmanList = new ArrayList<>();
         // 添加后线人员
         SysUserJzgInfoSalesman sysUserJzgInfoSalesman = new SysUserJzgInfoSalesman();
@@ -417,6 +423,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 
     /**
      * 新增业务员消息
+     *
      * @param userName
      * @param sysUserJzgInfo
      * @param tplCode
@@ -425,17 +432,17 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         // 获取消息模板 并替换内容
         SysMessageTemplate template = messageTemplateService.getModel(tplCode);
         Map<String, Object> valuesMap = new HashMap<>();
-        valuesMap.put("addUser",sysUserJzgInfo.getName());
+        valuesMap.put("addUser", sysUserJzgInfo.getName());
         valuesMap.put("createBy", userName);
-        valuesMap.put("issueName","");
-        valuesMap.put("issueNumber","");
-        String content = StringUtils.replaceContent(template.getContent(),valuesMap);
+        valuesMap.put("issueName", "");
+        valuesMap.put("issueNumber", "");
+        String content = StringUtils.replaceContent(template.getContent(), valuesMap);
         // 获取出单员
         String operatorCode = sysUserJzgInfo.getOperatorCode();
         // 获取接收用户
         List<String> recerveList = new ArrayList<>();
         userMessageTemplate.sendAddUser(sysUserJzgInfo.getId(), template.getTplName(),
-                content, tplCode,recerveList);
+                content, tplCode, recerveList);
     }
 
 
@@ -507,7 +514,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         if (sysUserJzgInfoBankCardVo.getAttachment() != null) {
             SysUploadFiles sysUploadFiles = sysUploadFilesMapper.selectOne
                     (new LambdaQueryWrapper<SysUploadFiles>().eq(SysUploadFiles::getId, sysUserJzgInfoBankCardVo.getAttachment()));
-            SysUserJzgInfoFile sysUserJzgInfoFile = new SysUserJzgInfoFile(sysUserJzgInfoBankCardVo.getAttachment(),sysUserJzgInfoBankCardVo.getUserJzgInfoId(),sysUploadFiles.getFileName());
+            SysUserJzgInfoFile sysUserJzgInfoFile = new SysUserJzgInfoFile(sysUserJzgInfoBankCardVo.getAttachment(), sysUserJzgInfoBankCardVo.getUserJzgInfoId(), sysUploadFiles.getFileName());
             sysUserJzgInfoFile.setId(fileId);
             sysUserJzgInfoFile.setFileUrl(MinioUtils.getPresignedObjectUrl("jzg", sysUploadFiles.getFileName()));
             sysUserJzgInfoFile.setFileType("bankcard");
@@ -549,7 +556,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 //            throw new SystemException("该业务员已被禁用");
 //        }
         BeanUtils.copyProperties(sysUserVo, sysUserJzgInfo);
-        verifyFile(sysUserVo,sysUserJzgInfo.getId());
+        verifyFile(sysUserVo, sysUserJzgInfo.getId());
         if (sysUserJzgInfo.getStatus() == 5) { // 如果状态为5  说明该业务员重新提交审核  进行业务员审核
             StateResult stateResult = userStateListener.salesmanAuthIng(sysUserJzgInfo);
             if (stateResult.isResult()) {
@@ -564,18 +571,18 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         //用户角色处理
         List<SysRole> userRole = sysUserRoleService.getUserRole(sysUserVo.getUserId());
         List<String> roleIds = userRole.stream().map(u -> u.getId()).collect(Collectors.toList());
-        if(!roleIds.isEmpty()) {
-            sysUserRoleService.deleteByUserId(sysUserVo.getUserId(),roleIds);
+        if (!roleIds.isEmpty()) {
+            sysUserRoleService.deleteByUserId(sysUserVo.getUserId(), roleIds);
         }
         List<SysUserRole> sysUserRoleList = new ArrayList<>();
-        sysUserVo.getRoleIds().forEach(roleId->{
-            SysUserRole sysUserRole = new SysUserRole(sysUserVo.getUserId(),roleId);
+        sysUserVo.getRoleIds().forEach(roleId -> {
+            SysUserRole sysUserRole = new SysUserRole(sysUserVo.getUserId(), roleId);
             sysUserRoleList.add(sysUserRole);
         });
         sysUserRoleService.saveBatch(sysUserRoleList);
 
         //修改团队信息
-        if(sysUserVo.getOrganizationId() != null && !sysUserVo.getOrganizationId().isEmpty()) {
+        if (sysUserVo.getOrganizationId() != null && !sysUserVo.getOrganizationId().isEmpty()) {
             sysOrganizationUserLinkService.remove(new LambdaQueryWrapper<SysOrganizationUserLink>()
                     .eq(SysOrganizationUserLink::getUserId, sysUserVo.getUserId())
                     .eq(SysOrganizationUserLink::getOrganizationId, sysUserVo.getOrganizationId()));
@@ -596,25 +603,25 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             throw new SystemException("该用户不存在");
         }
         SysUser sysUser = sysUserService.getById(sysUserJzgInfo.getUserId());
-        if(sysUser == null){
+        if (sysUser == null) {
             throw new SystemException("该用户不存在");
         }
         sysUserJzgInfo.setMobile(sysUser.getMobile());
         SysDept dept = sysDeptService.getById(sysUserJzgInfo.getDeptId());
-        if(!Objects.isNull(dept)){
+        if (!Objects.isNull(dept)) {
             sysUserJzgInfo.setDeptName(dept.getName());
         }
         List<String> areaList = new ArrayList<>();
-        if(!Objects.isNull(sysUserJzgInfo.getProvince()) && !sysUserJzgInfo.getProvince().isEmpty()){
+        if (!Objects.isNull(sysUserJzgInfo.getProvince()) && !sysUserJzgInfo.getProvince().isEmpty()) {
             areaList.add(sysUserJzgInfo.getProvince());
-        }else if(!Objects.isNull(sysUserJzgInfo.getCity()) && !sysUserJzgInfo.getCity().isEmpty()) {
+        } else if (!Objects.isNull(sysUserJzgInfo.getCity()) && !sysUserJzgInfo.getCity().isEmpty()) {
             areaList.add(sysUserJzgInfo.getCity());
-        }else if(!Objects.isNull(sysUserJzgInfo.getDistrict()) && !sysUserJzgInfo.getDistrict().isEmpty()){
+        } else if (!Objects.isNull(sysUserJzgInfo.getDistrict()) && !sysUserJzgInfo.getDistrict().isEmpty()) {
             areaList.add(sysUserJzgInfo.getDistrict());
         }
-        if(areaList.size() == 0){
+        if (areaList.size() == 0) {
             sysUserJzgInfo.setRegion("");
-        }else {
+        } else {
             List<SysArea> sysAreas = sysAreaService.queryAllByAreaCode(areaList);
             String region = "";
             for (int i = 0; i < sysAreas.size(); i++) {
@@ -624,7 +631,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         }
         if (!Objects.isNull(sysUserJzgInfo.getLeaderId()) && !sysUserJzgInfo.getLeaderId().equals("")) {
             SysUserJzgInfo userJzgInfo = sysUserJzgInfoService.getById(sysUserJzgInfo.getLeaderId());
-            if(Objects.nonNull(userJzgInfo)){
+            if (Objects.nonNull(userJzgInfo)) {
                 sysUserJzgInfo.setLeaderName(userJzgInfo.getName());
             }
         }
@@ -636,10 +643,10 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
                 (new LambdaQueryWrapper<SysOrganizationUserLink>().eq(SysOrganizationUserLink::getUserId, sysUserJzgInfo.getUserId()));
 
 
-        if(!Objects.isNull(sysOrganizationUserLink)){
+        if (!Objects.isNull(sysOrganizationUserLink)) {
             String organizationId = sysOrganizationUserLink.getOrganizationId();
             SysOrganization sysOrganization = sysOrganizationService.getById(organizationId);
-            if(!Objects.isNull(sysOrganization)){
+            if (!Objects.isNull(sysOrganization)) {
                 String organizationName = sysOrganizationService.getById(organizationId).getName();
                 sysUserJzgInfo.setOrganizationId(organizationId);
                 sysUserJzgInfo.setOrganizationName(organizationName);
@@ -655,9 +662,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 
 
         List<SysUserJzgInfoFile> sysUserJzgInfoFile = sysUserJzgInfoFileService.list
-                (new LambdaQueryWrapper<SysUserJzgInfoFile>().eq(SysUserJzgInfoFile::getUserId,sysUserJzgInfo.getId()));
+                (new LambdaQueryWrapper<SysUserJzgInfoFile>().eq(SysUserJzgInfoFile::getUserId, sysUserJzgInfo.getId()));
         sysUserJzgInfo.setFileList(sysUserJzgInfoFile);
-        List<SysUserJzgInfoBankCardDto> sysUserJzgInfoBankCardDto = sysUserJzgInfoBankCardService.getBankCardByUserId(sysUserJzgInfo.getId(),baseController.getUserSystemCode());
+        List<SysUserJzgInfoBankCardDto> sysUserJzgInfoBankCardDto = sysUserJzgInfoBankCardService.getBankCardByUserId(sysUserJzgInfo.getId(), baseController.getUserSystemCode());
         sysUserJzgInfo.setBankCardList(sysUserJzgInfoBankCardDto);
         if (!sysUserJzgInfoBankCardDto.isEmpty()) {
             sysUserJzgInfo.setBankCardNumber(sysUserJzgInfoBankCardDto.get(0).getBankCardNumber());
@@ -667,14 +674,16 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     }
 
 
-    public void verifyUser(String typeAttr,String deptId,String identity,String userId,String leaderId,String referrerId,String mobile){
+    public void verifyUser(String typeAttr, String deptId, String identity, String userId, String leaderId, String referrerId, String mobile) {
         SysDept sysDept = sysDeptService.getById(deptId);
 
-        List<SysUserJzgInfo> sysUserJzgInfos  = sysUserJzgInfoService.getUserInfoByIdentity(identity, userId);
+        List<SysUserJzgInfo> sysUserJzgInfos = sysUserJzgInfoService.getUserInfoByIdentity(identity, userId);
         SysUserJzgInfo sysUserJzgInfoByLeaderId = sysUserJzgInfoService.getOne
-                (new LambdaQueryWrapper<SysUserJzgInfo>().eq(SysUserJzgInfo::getId,leaderId).eq(SysUserJzgInfo::getIsDelete,0));
+                (new LambdaQueryWrapper<SysUserJzgInfo>().eq(SysUserJzgInfo::getId, leaderId)
+                        .eq(SysUserJzgInfo::getIsDelete, 0));
         SysUserJzgInfo sysUserJzgInfoByReferrerId = sysUserJzgInfoService.getOne
-                (new LambdaQueryWrapper<SysUserJzgInfo>().eq(SysUserJzgInfo::getId,referrerId).eq(SysUserJzgInfo::getIsDelete,0));
+                (new LambdaQueryWrapper<SysUserJzgInfo>().eq(SysUserJzgInfo::getId, referrerId)
+                        .eq(SysUserJzgInfo::getIsDelete, 0));
         SysUserJzgInfo userByMobile = sysUserJzgInfoService.getUserByMobile(mobile);
 
         if (sysUserJzgInfos.size() > 0) {
@@ -683,7 +692,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         if (sysDept == null) {
             throw new SystemException("所选机构不存在");
         }
-        if(!typeAttr.equals("2")) {
+        if (!typeAttr.equals("2")) {
             if (sysUserJzgInfoByLeaderId == null) {
                 throw new SystemException("所选管理员不存在");
             }
@@ -691,7 +700,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
                 throw new SystemException("所选推荐人不存在");
             }
         }
-        if(Objects.nonNull(userByMobile)){
+        if (Objects.nonNull(userByMobile)) {
             throw new ValidateException("手机号已存在无法添加");
         }
     }
@@ -704,7 +713,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         sysOrganizationUserLinkService.save(sysOrganizationUserLink);
     }
 
-    public void saveFile(String sfz1, String sfz2, String qualification, String contract, String applicant, String salaryTable, String leaveTable,String userId) {
+    public void saveFile(String sfz1, String sfz2, String qualification, String contract, String applicant, String salaryTable, String leaveTable, String userId) {
         saveSingleFile(sfz1, "sfz1", userId);
         saveSingleFile(sfz2, "sfz2", userId);
         saveSingleFile(qualification, "qualification", userId);
@@ -713,6 +722,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         saveSingleFile(salaryTable, "salary", userId);
         saveSingleFile(leaveTable, "leave", userId);
     }
+
     private void saveSingleFile(String fileId, String fileType, String userId) {
         if (!Objects.isNull(fileId) && !fileId.isEmpty()) {
             SysUploadFiles sysUploadFiles = sysUploadFilesMapper.selectOne(
@@ -724,16 +734,16 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         }
     }
 
-    public boolean uploadFile(String fileId,String fileType,String userId){
+    public boolean uploadFile(String fileId, String fileType, String userId) {
         List<SysUserJzgInfoFile> sysUserJzgInfoFiles = sysUserJzgInfoFileService.list(
                 (new LambdaQueryWrapper<SysUserJzgInfoFile>().eq(SysUserJzgInfoFile::getUserId, userId)
                         .eq(SysUserJzgInfoFile::getFileType, fileType)));
-        if(sysUserJzgInfoFiles.size()>0) {
+        if (sysUserJzgInfoFiles.size() > 0) {
             sysUserJzgInfoFileService.removeBatchByIds(sysUserJzgInfoFiles);
         }
         SysUploadFiles sysUploadFiles = sysUploadFilesMapper.selectOne
                 (new LambdaQueryWrapper<SysUploadFiles>().eq(SysUploadFiles::getId, fileId));
-        if(sysUploadFiles != null) {
+        if (sysUploadFiles != null) {
             SysUserJzgInfoFile sysUserJzgInfoFile = new SysUserJzgInfoFile(fileId, userId, sysUploadFiles.getFileName());
             sysUserJzgInfoFile.setFileType(fileType);
             sysUserJzgInfoFile.setFileUrl(MinioUtils.getPresignedObjectUrl("jzg", sysUploadFiles.getFileName()));
@@ -744,17 +754,22 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 
     /**
      * 检测文件是否修改
+     *
      * @return
      */
-    public boolean checkFileModify(List<SysUserJzgInfoFile> fileList,String fileType,String fileId){
-        if(fileId!=null && !fileId.isEmpty()) {
-            List<SysUserJzgInfoFile> collect = fileList.stream().filter(x -> x.getId().equals(fileId) && x.getFileType().equals(fileType)).collect(Collectors.toList());
+    public boolean checkFileModify(List<SysUserJzgInfoFile> fileList, String fileType, String fileId) {
+        if (fileId != null && !fileId.isEmpty()) {
+            List<SysUserJzgInfoFile> collect = fileList.stream()
+                    .filter(x -> x.getId().equals(fileId) && x.getFileType().equals(fileType))
+                    .collect(Collectors.toList());
             if (collect.size() > 0) {
                 return false;
             }
-        }else{
+        } else {
             //如果传入的文件id为空  ， 判断是否存在文件 如果存在则删除
-            List<SysUserJzgInfoFile> collect = fileList.stream().filter(x -> x.getFileType().equals(fileType)).collect(Collectors.toList());
+            List<SysUserJzgInfoFile> collect = fileList.stream()
+                    .filter(x -> x.getFileType().equals(fileType))
+                    .collect(Collectors.toList());
             if (collect.size() > 0) {
                 sysUserJzgInfoFileService.removeBatchByIds(collect);
             }
@@ -764,44 +779,44 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         return true;
     }
 
-    public void verifyFile(SysUserVo sysUserVo,String userId){
+    public void verifyFile(SysUserVo sysUserVo, String userId) {
         List<SysUserJzgInfoFile> fileList = sysUserJzgInfoFileService.list(new LambdaQueryWrapper<SysUserJzgInfoFile>()
                 .eq(SysUserJzgInfoFile::getUserId, userId));
-        if(checkFileModify(fileList,"sfz1",sysUserVo.getSfz1())){
-            uploadFile(sysUserVo.getSfz1(),"sfz1",userId);
+        if (checkFileModify(fileList, "sfz1", sysUserVo.getSfz1())) {
+            uploadFile(sysUserVo.getSfz1(), "sfz1", userId);
         }
-        if(checkFileModify(fileList,"sfz2",sysUserVo.getSfz2())){
-            uploadFile(sysUserVo.getSfz2(),"sfz2",userId);
+        if (checkFileModify(fileList, "sfz2", sysUserVo.getSfz2())) {
+            uploadFile(sysUserVo.getSfz2(), "sfz2", userId);
         }
 
-        if(checkFileModify(fileList,"qualification",sysUserVo.getQualification())){
-            uploadFile(sysUserVo.getQualification(),"qualification",userId);
+        if (checkFileModify(fileList, "qualification", sysUserVo.getQualification())) {
+            uploadFile(sysUserVo.getQualification(), "qualification", userId);
         }
 
-        if(checkFileModify(fileList,"contract",sysUserVo.getContract())){
-            uploadFile(sysUserVo.getContract(),"contract",userId);
+        if (checkFileModify(fileList, "contract", sysUserVo.getContract())) {
+            uploadFile(sysUserVo.getContract(), "contract", userId);
         }
 
-        if(checkFileModify(fileList,"applicant",sysUserVo.getApplicant())){
-            uploadFile(sysUserVo.getApplicant(),"applicant",userId);
+        if (checkFileModify(fileList, "applicant", sysUserVo.getApplicant())) {
+            uploadFile(sysUserVo.getApplicant(), "applicant", userId);
         }
 
-        if(checkFileModify(fileList,"salaryTable",sysUserVo.getSalaryTable())){
-            uploadFile(sysUserVo.getSalaryTable(),"salaryTable",userId);
+        if (checkFileModify(fileList, "salaryTable", sysUserVo.getSalaryTable())) {
+            uploadFile(sysUserVo.getSalaryTable(), "salaryTable", userId);
         }
 
-        if(checkFileModify(fileList,"leaveTable",sysUserVo.getLeaveTable())){
-            uploadFile(sysUserVo.getLeaveTable(),"leaveTable",userId);
+        if (checkFileModify(fileList, "leaveTable", sysUserVo.getLeaveTable())) {
+            uploadFile(sysUserVo.getLeaveTable(), "leaveTable", userId);
         }
 
-        if(checkFileModify(fileList,"bankCard",sysUserVo.getBankCard())){
-            uploadFile(sysUserVo.getBankCard(),"bankCard",userId);
+        if (checkFileModify(fileList, "bankCard", sysUserVo.getBankCard())) {
+            uploadFile(sysUserVo.getBankCard(), "bankCard", userId);
         }
     }
 
     @Override
     public Object getHistoryData(String id) {
-        return  sysUserJzgInfoService.getById(id);
+        return sysUserJzgInfoService.getById(id);
     }
 
     @Override
@@ -813,6 +828,12 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     public SalesmanVo getUserInfoBySystemCodeAndUserId(String userId) {
         return sysUserJzgInfoMapper.getUserInfoBySystemCodeAndUserId(userId);
     }
+
+    @Override
+    public void setTenantList(String systemCode, String userId) {
+       redissonClient.getBucket(RedisKeyConstants.APP_SYSTEM_CODE + userId).set(systemCode);
+    }
+
 }
 
 

tenant/organization/src/main/resources/mapper/SysUserJzgInfoMapper.xml

@@ -142,6 +142,7 @@
                         mobile = #{userId}
                     OR username = #{userId})
         AND suji.system_code != 'APP'
+        AND suji.is_enable = 0
     </select>
 
     <select id="getUserJzgInfoByUserId" resultType="com.jzg.commons.entity.po.SysUserJzgInfo">