修改合伙人团队长权限问题

partner/src/main/java/com/jzg/utils/DistributionUtils.java

@@ -70,7 +70,6 @@ public class DistributionUtils {
             log.info("当前出单员不是合伙人用户：{}");
         }
         String userId = userInfoById.getId();
-        RequestContextUtil.setStringParam(userId);
         String userId3 = CalculateCommissionUtils.querySuperiorAndSubordinate(userId, GRADE_3);
         String userId4 = CalculateCommissionUtils.querySuperiorAndSubordinate(userId, GRADE_4);
         PartnerUser partnerUser = staticPartnerUserService.selectByUserId(userId);

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

@@ -1229,13 +1229,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
                throw new SystemException(result.getMsg());
            }
            // 关联用户角色
-           SysRole sysRole = roleMapper.selectOne(new LambdaQueryWrapper<>(SysRole.class).eq(SysRole::getName, "业务员").last("LIMIT 1"));
-           if (!Objects.isNull(sysRole)){
-               SysUserRole userRole = new SysUserRole();
-               userRole.setUserId(userByUserId.getUserId());
-               userRole.setRoleId(sysRole.getId());
-               sysUserRoleMapper.insert(userRole);
-           }
+           saveRole(userByUserId);
            return HttpResult.ok("添加业务员成功");
        }catch (Exception e){
            e.printStackTrace();
@@ -1292,16 +1286,6 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
                 sysUserJzgInfoBankCardRecord.setStatus("0");
                 sysUserJzgInfoBankCardRecordService.save(sysUserJzgInfoBankCardRecord);
             }
-            //如果角色存在的话则存储角色
-            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);
-                    sysUserRoleList.add(sysUserRole);
-                });
-                sysUserRoleService.saveBatch(sysUserRoleList);
-            }
             sysUserVo.setUserId(sysUserJzgInfo.getId());
         }else {
             sysUserJzgInfo = sysUserJzgInfoService.getUserByUserId(sysUser.getId());
@@ -1341,6 +1325,21 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             // 添加团队关联用户
             saveOrganization(userLink.getOrganizationId(),sysUserJzgInfo.getUserId());
         }
+        if(!Objects.isNull(sysUserVo.getGrade()) && 3 < sysUserVo.getGrade()){
+            // 关联用户角色
+            saveRole(sysUserJzgInfo);
+        }
+
+    }
+
+    private void saveRole(SysUserJzgInfo sysUserJzgInfo) {
+        SysRole sysRole = roleMapper.selectOne(new LambdaQueryWrapper<>(SysRole.class).eq(SysRole::getName, "业务员").last("LIMIT 1"));
+        if (!Objects.isNull(sysRole)){
+            SysUserRole userRole = new SysUserRole();
+            userRole.setUserId(sysUserJzgInfo.getUserId());
+            userRole.setRoleId(sysRole.getId());
+            sysUserRoleMapper.insert(userRole);
+        }
     }
 
     public void partnerAddsSalespersonIdentity(String infoId,String type){