代课录单权限问题

src/main/java/com/ydtech/modules/admin/dao/SysBusinessGroupingMapper.java

@@ -0,0 +1,18 @@
+package com.ydtech.modules.admin.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ydtech.modules.admin.model.po.SysBusinessGrouping;
+
+/**
+ * @author Administrator
+ * @description 针对表【sys_business_grouping(运营业务分组)】的数据库操作Mapper
+ * @createDate 2025-03-29 09:23:54
+ * @Entity generator.domain.SysBusinessGrouping
+ */
+public interface SysBusinessGroupingMapper extends BaseMapper<SysBusinessGrouping> {
+
+}
+
+
+
+

src/main/java/com/ydtech/modules/admin/dao/SysUserMapper.java

@@ -547,6 +547,15 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
      */
     List<SysUser> queryUpTheLeader(@Param("userId") String userId);
 
+
+    /**
+     * 根据分组查询
+     *
+     * @param userId 用户id
+     * @return 分组用户
+     */
+    List<SysUser> queryByBusinessGrouping(@Param("userId") String userId);
+
     /**
      * @version
      * @author: hxl

src/main/java/com/ydtech/modules/admin/model/po/SysBusinessGrouping.java

@@ -0,0 +1,88 @@
+package com.ydtech.modules.admin.model.po;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 运营业务分组
+ * @TableName sys_business_grouping
+ */
+@TableName(value ="sys_business_grouping")
+@Data
+public class SysBusinessGrouping implements Serializable {
+    /**
+     * id
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 分组编号
+     */
+    @TableField(value = "grouping_id")
+    private Integer groupingId;
+
+    /**
+     * 用户id
+     */
+    @TableField(value = "user_id")
+    private String userId;
+
+    /**
+     * 用户名称
+     */
+    @TableField(value = "user_name")
+    private String userName;
+
+    @TableField(exist = false)
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public boolean equals(Object that) {
+        if (this == that) {
+            return true;
+        }
+        if (that == null) {
+            return false;
+        }
+        if (getClass() != that.getClass()) {
+            return false;
+        }
+        SysBusinessGrouping other = (SysBusinessGrouping) that;
+        return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
+            && (this.getGroupingId() == null ? other.getGroupingId() == null : this.getGroupingId().equals(other.getGroupingId()))
+            && (this.getUserId() == null ? other.getUserId() == null : this.getUserId().equals(other.getUserId()))
+            && (this.getUserName() == null ? other.getUserName() == null : this.getUserName().equals(other.getUserName()));
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((getId() == null) ? 0 : getId().hashCode());
+        result = prime * result + ((getGroupingId() == null) ? 0 : getGroupingId().hashCode());
+        result = prime * result + ((getUserId() == null) ? 0 : getUserId().hashCode());
+        result = prime * result + ((getUserName() == null) ? 0 : getUserName().hashCode());
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", id=").append(id);
+        sb.append(", groupingId=").append(groupingId);
+        sb.append(", userId=").append(userId);
+        sb.append(", userName=").append(userName);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

src/main/java/com/ydtech/modules/admin/service/SysBusinessGroupingService.java

@@ -0,0 +1,15 @@
+package com.ydtech.modules.admin.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ydtech.modules.admin.model.po.SysBusinessGrouping;
+
+/**
+* @author Administrator
+* @description 针对表【sys_business_grouping(运营业务分组)】的数据库操作Service
+* @createDate 2025-03-29 09:23:54
+*/
+public interface SysBusinessGroupingService extends IService<SysBusinessGrouping> {
+
+
+
+}

src/main/java/com/ydtech/modules/admin/service/impl/SysBusinessGroupingServiceImpl.java

@@ -0,0 +1,22 @@
+package com.ydtech.modules.admin.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ydtech.modules.admin.model.po.SysBusinessGrouping;
+import com.ydtech.modules.admin.dao.SysBusinessGroupingMapper;
+import com.ydtech.modules.admin.service.SysBusinessGroupingService;
+import org.springframework.stereotype.Service;
+
+/**
+* @author Administrator
+* @description 针对表【sys_business_grouping(运营业务分组)】的数据库操作Service实现
+* @createDate 2025-03-29 09:23:54
+*/
+@Service
+public class SysBusinessGroupingServiceImpl extends ServiceImpl<SysBusinessGroupingMapper, SysBusinessGrouping>
+    implements SysBusinessGroupingService{
+
+}
+
+
+
+

src/main/java/com/ydtech/modules/admin/service/impl/SysUserServiceImpl.java

@@ -72,7 +72,6 @@ import java.util.*;
 import java.util.stream.Collectors;
 
 
-
 @Service
 @Slf4j
 public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> implements SysUserService {
@@ -162,7 +161,6 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     private String referrerId;
 
 
-
     @Override
     public IPage<SysUserBaseVO> findUserList(PageDto<SysUserDto> pageDto) {
         PageVo<SysUserBaseVO> pageVo = new PageVo();
@@ -330,7 +328,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
                             }
                             //添加总额
                             teamNum.setTotalSumpremium(String.valueOf(new BigDecimal(teamNum.getTotalSumpremium())
-                                    .add(new BigDecimal(quTeamNum.getSyPremiumSum())).add(new BigDecimal(quTeamNum.getJqPremiumSum()))));
+                                    .add(new BigDecimal(quTeamNum.getSyPremiumSum()))
+                                    .add(new BigDecimal(quTeamNum.getJqPremiumSum()))));
                             teamNum.setSyPremiumSum(String.valueOf(new BigDecimal(teamNum.getSyPremiumSum()).add(new BigDecimal(quTeamNum.getSyPremiumSum()))));
                             teamNum.setJqPremiumSum(String.valueOf(new BigDecimal(teamNum.getJqPremiumSum()).add(new BigDecimal(quTeamNum.getJqPremiumSum()))));
                             teamNum.setQuoteNum(String.valueOf(new BigDecimal(teamNum.getQuoteNum()).add(new BigDecimal(quTeamNum.getCount()))));
@@ -361,7 +360,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         });
 
         List<QuTeamNum> collect1 =
-                quTeamNums.stream().skip((quTeamNumDto.getPageNo() - 1) * quTeamNumDto.getPageSize()).limit(quTeamNumDto.getPageSize()).
+                quTeamNums.stream()
+                        .skip((quTeamNumDto.getPageNo() - 1) * quTeamNumDto.getPageSize())
+                        .limit(quTeamNumDto.getPageSize()).
                         collect(Collectors.toList());
         IPage<QuTeamNum> page = new Page<>(quTeamNumDto.getPageNo(), quTeamNumDto.getPageSize());
         page.setRecords(collect1);
@@ -384,7 +385,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         String timeCreate = simpleDateFormat.format(sysUser.getCreateTime());
         String userId = sysUser.getId();
-        List<SysUserTrack> sysUserTracks = sysUserTrackService.list(new LambdaQueryWrapper<SysUserTrack>().eq(SysUserTrack::getUserId, userId).orderByDesc(SysUserTrack::getApproveTime));
+        List<SysUserTrack> sysUserTracks = sysUserTrackService.list(new LambdaQueryWrapper<SysUserTrack>().eq(SysUserTrack::getUserId, userId)
+                .orderByDesc(SysUserTrack::getApproveTime));
         SysUserTrack sysUserTrack = sysUserTracks.get(0);
 
         Integer type = sysUser.getType();
@@ -547,7 +549,10 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             List<SysMenu> sysMenuList = sysRoleMenuService.gainMenuIds(sysUser.getId());
 
             lsPerms =
-                    sysMenuList.stream().filter(a -> StringUtils.isNotEmpty(a.getPerms())).map(SysMenu::getPerms).collect(Collectors.toList());
+                    sysMenuList.stream()
+                            .filter(a -> StringUtils.isNotEmpty(a.getPerms()))
+                            .map(SysMenu::getPerms)
+                            .collect(Collectors.toList());
 
         }
 
@@ -734,7 +739,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 
 
         String maxId = "";
-        if (null != userMaxId) maxId = userMaxId.getId();
+        if (null != userMaxId) {
+            maxId = userMaxId.getId();
+        }
 
         if (StringUtils.isNullOrEmpty(maxId)) {
             nextPK = deptId + "001";
@@ -915,7 +922,10 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             SysUserInfo userInfo = sysUserVo.getSysUserInfo();
             if (userInfo != null) {
                 if (null != userInfo.getLiveAddressString() && userInfo.getLiveAddressString().length > 0) {
-                    sysUserVo.getSysUserInfo().setLiveAddress(Arrays.stream(userInfo.getLiveAddressString()).map(item -> item.toString()).collect(Collectors.joining(",")));
+                    sysUserVo.getSysUserInfo()
+                            .setLiveAddress(Arrays.stream(userInfo.getLiveAddressString())
+                                    .map(item -> item.toString())
+                                    .collect(Collectors.joining(",")));
                 }
                 userInfo.setId(sysUser.getId());
             }
@@ -924,7 +934,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         }
         List<EsmUserImageVo> esmUserImageVo = sysUserVo.getEsmUserImageVo();
         String finalUserId = userId;
-        List<EsmUserImage> esmUserImages = esmUserImageVo.stream().map(x -> new EsmUserImage(x, finalUserId)).collect(Collectors.toList());
+        List<EsmUserImage> esmUserImages = esmUserImageVo.stream()
+                .map(x -> new EsmUserImage(x, finalUserId))
+                .collect(Collectors.toList());
         esmUserImageService.saveBatch(esmUserImages);
         SpringUtil.getBean(RecordUserUtils.class).addRecord(userId, BaseController.getUserName());
         return HttpResult.ok("新增成功");
@@ -974,7 +986,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             systemMessage.setSendTime(date);
             systemMessageList.add(systemMessage);
         }
-            systemMessageService.addSystemMessageList(systemMessageList);
+        systemMessageService.addSystemMessageList(systemMessageList);
     }
 
     //代理人新增 发送审核站内信
@@ -988,8 +1000,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 
         String managementSource = new String();
         SysDept dept = sysDeptService.getById(sysUser.getDeptId());
-        if (!StringUtils.isNullOrEmpty(dept))
+        if (!StringUtils.isNullOrEmpty(dept)) {
             managementSource = dept.getManagementSource();
+        }
 
 
         Map<String, String> map = new HashMap<>();
@@ -1023,7 +1036,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             systemMessage.setSendTime(date);
             systemMessageList.add(systemMessage);
         }
-            systemMessageService.addSystemMessageList(systemMessageList);
+        systemMessageService.addSystemMessageList(systemMessageList);
     }
 
     @Override
@@ -1072,12 +1085,16 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         //1：合伙人 2：工作室管理员
         Integer type = sysUser.getType();
         // 手机号
-        List<SysUser> mobileList = lambdaQuery().eq(SysUser::getMobile, sysUser.getMobile()).eq(SysUser::getType,type).list();
+        List<SysUser> mobileList = lambdaQuery().eq(SysUser::getMobile, sysUser.getMobile())
+                .eq(SysUser::getType, type)
+                .list();
         if (!mobileList.isEmpty()) {
             throw new SystemException("手机号已经注册请更换手机号。");
         }
         // 身份证号
-        List<SysUser> identityList = lambdaQuery().eq(SysUser::getIdentity, sysUser.getIdentity()).eq(SysUser::getType,type).list();
+        List<SysUser> identityList = lambdaQuery().eq(SysUser::getIdentity, sysUser.getIdentity())
+                .eq(SysUser::getType, type)
+                .list();
         if (!identityList.isEmpty()) {
             throw new SystemException("身份证号已经注册请更换身份证号。");
         }
@@ -1147,11 +1164,14 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             SysUserInfo userInfo = sysUserVo.getSysUserInfo();
             if (userInfo != null) {
                 if (null != userInfo.getLiveAddressString() && userInfo.getLiveAddressString().length > 0) {
-                    sysUserVo.getSysUserInfo().setLiveAddress(Arrays.stream(userInfo.getLiveAddressString()).map(item -> item.toString()).collect(Collectors.joining(",")));
+                    sysUserVo.getSysUserInfo()
+                            .setLiveAddress(Arrays.stream(userInfo.getLiveAddressString())
+                                    .map(item -> item.toString())
+                                    .collect(Collectors.joining(",")));
                 }
                 userInfo.setId(sysUser.getId());
-            }else {
-                userInfo=new SysUserInfo();
+            } else {
+                userInfo = new SysUserInfo();
                 userInfo.setId(sysUser.getId());
             }
             sysUserInfoService.save(userInfo);
@@ -1159,15 +1179,18 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         List<EsmUserImageVo> esmUserImageVo = sysUserVo.getEsmUserImageVo();
         String finalUserId = userId;
         if (!CollectionUtils.isEmpty(esmUserImageVo)) {
-            List<EsmUserImage> esmUserImages = esmUserImageVo.stream().map(x -> new EsmUserImage(x, finalUserId)).collect(Collectors.toList());
+            List<EsmUserImage> esmUserImages = esmUserImageVo.stream()
+                    .map(x -> new EsmUserImage(x, finalUserId))
+                    .collect(Collectors.toList());
             esmUserImageService.saveBatch(esmUserImages);
         }
         String referrerId = sysUserVo.getSysUser().getReferrerId();
         if (referrerId == null) {
             SpringUtil.getBean(RecordUserUtils.class).addRecord(userId, "admin");
-        }else {
+        } else {
             SysUser sysUser1 = sysUserMapper.selectById(sysUserVo.getSysUser().getReferrerId());
-            SpringUtil.getBean(RecordUserUtils.class).addRecord(userId, Optional.ofNullable(sysUser1.getName()).orElse("admin") );
+            SpringUtil.getBean(RecordUserUtils.class)
+                    .addRecord(userId, Optional.ofNullable(sysUser1.getName()).orElse("admin"));
         }
         return HttpResult.ok("新增成功", sysUserMapper.selectById(userId));
     }
@@ -1181,7 +1204,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         sysUser.setType(3);
         sysUser.setCreateTime(new Date());
         SysUserInfo sysUserInfo = new SysUserInfo();
-        LocalDate birthday = LocalDate.parse(sysUser.getIdentity().substring(6, 10) + "-" + sysUser.getIdentity().substring(10, 12) + "-" + sysUser.getIdentity().substring(12, 14));
+        LocalDate birthday = LocalDate.parse(sysUser.getIdentity().substring(6, 10) + "-" + sysUser.getIdentity()
+                .substring(10, 12) + "-" + sysUser.getIdentity().substring(12, 14));
         sysUserInfo.setBirthday(birthday);
         sysUserVo.setSysUserInfo(sysUserInfo);
         // 先创建工作室下的团队
@@ -1241,12 +1265,16 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 
 //        SysUser sysUser = sysUserVo.getSysUser();
         // 手机号
-        List<SysUser> mobileList = lambdaQuery().eq(SysUser::getMobile, sysUser.getMobile()).eq(SysUser::getType,sysUser.getType()).list();
+        List<SysUser> mobileList = lambdaQuery().eq(SysUser::getMobile, sysUser.getMobile())
+                .eq(SysUser::getType, sysUser.getType())
+                .list();
         if (!mobileList.isEmpty()) {
             throw new SystemException("手机号已经注册请更换手机号。");
         }
         // 身份证号
-        List<SysUser> identityList = lambdaQuery().eq(SysUser::getIdentity, sysUser.getIdentity()).eq(SysUser::getType,sysUser.getType()).list();
+        List<SysUser> identityList = lambdaQuery().eq(SysUser::getIdentity, sysUser.getIdentity())
+                .eq(SysUser::getType, sysUser.getType())
+                .list();
         if (!identityList.isEmpty()) {
             throw new SystemException("身份证号已经注册请更换身份证号。");
         }
@@ -1318,7 +1346,10 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             SysUserInfo userInfo = sysUserVo.getSysUserInfo();
             if (userInfo != null) {
                 if (null != userInfo.getLiveAddressString() && userInfo.getLiveAddressString().length > 0) {
-                    sysUserVo.getSysUserInfo().setLiveAddress(Arrays.stream(userInfo.getLiveAddressString()).map(item -> item.toString()).collect(Collectors.joining(",")));
+                    sysUserVo.getSysUserInfo()
+                            .setLiveAddress(Arrays.stream(userInfo.getLiveAddressString())
+                                    .map(item -> item.toString())
+                                    .collect(Collectors.joining(",")));
                 }
                 userInfo.setId(sysUser.getId());
             }
@@ -1328,11 +1359,14 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         List<EsmUserImageVo> esmUserImageVo = sysUserVo.getEsmUserImageVo();
         String finalUserId = userId;
         if (!CollectionUtils.isEmpty(esmUserImageVo)) {
-            List<EsmUserImage> esmUserImages = esmUserImageVo.stream().map(x -> new EsmUserImage(x, finalUserId)).collect(Collectors.toList());
+            List<EsmUserImage> esmUserImages = esmUserImageVo.stream()
+                    .map(x -> new EsmUserImage(x, finalUserId))
+                    .collect(Collectors.toList());
             esmUserImageService.saveBatch(esmUserImages);
         }
         SysUser referrerInfo = sysUserMapper.selectById(sysUserVo.getSysUser().getReferrerId());
-        SpringUtil.getBean(RecordUserUtils.class).addRecord(userId, Optional.ofNullable(referrerInfo.getName()).orElse("admin"));
+        SpringUtil.getBean(RecordUserUtils.class)
+                .addRecord(userId, Optional.ofNullable(referrerInfo.getName()).orElse("admin"));
         return HttpResult.ok("新增成功", sysUserMapper.selectById(userId));
     }
 
@@ -1374,9 +1408,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         SysUser sysUser = sysUserVo.getSysUser();
         int beStatus = sysUser.getStatus();
         //查找数据库是否存在相同的身份证
-        if(sysUserMapper.selectCount(new LambdaQueryWrapper<SysUser>()
+        if (sysUserMapper.selectCount(new LambdaQueryWrapper<SysUser>()
                 .eq(SysUser::getIdentity, sysUserVo.getSysUser().getIdentity())
-                .ne(SysUser::getId,sysUserVo.getSysUser().getId())) > 0){
+                .ne(SysUser::getId, sysUserVo.getSysUser().getId())) > 0) {
             return HttpResult.error("已存在身份证号，无法修改");
         }
 
@@ -1445,7 +1479,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
                 updateById(sysUser);
             }
 
-            if(StringUtils.isEmpty(sysUser.getLeaderId())){
+            if (StringUtils.isEmpty(sysUser.getLeaderId())) {
                 SysUser leaderUser = baseMapper.getByRoleIdAndDeptId("21", sysUser.getDeptId());
                 sysUser.setLeaderId(leaderUser.getLeaderId());
                 sysUser.setLeaderName(leaderUser.getLeaderName());
@@ -1461,7 +1495,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 
             SysDept sysDept = sysDeptService.getById(sysUser.getDeptId());
             // 渠道负责人更新数据
-            if (ManagementSource.MS_01.getCode().equals(sysDept.getManagementSource()) && "21".equals(sysUser.getRoleId())) {
+            if (ManagementSource.MS_01.getCode()
+                    .equals(sysDept.getManagementSource()) && "21".equals(sysUser.getRoleId())) {
                 boolean update = lambdaUpdate()
                         .set(SysUser::getLeaderId, sysUser.getLeaderId())
                         .set(SysUser::getLeaderName, sysUser.getLeaderName())
@@ -1485,7 +1520,10 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             //用户详情信息
             SysUserInfo sysUserInfo = sysUserVo.getSysUserInfo();
             if (null != sysUserInfo.getLiveAddressString() && sysUserInfo.getLiveAddressString().length > 0) {
-                sysUserVo.getSysUserInfo().setLiveAddress(Arrays.stream(sysUserInfo.getLiveAddressString()).map(item -> item.toString()).collect(Collectors.joining(",")));
+                sysUserVo.getSysUserInfo()
+                        .setLiveAddress(Arrays.stream(sysUserInfo.getLiveAddressString())
+                                .map(item -> item.toString())
+                                .collect(Collectors.joining(",")));
             }
             sysUserInfo.setId(userId);
             if (null == sysUserInfo.getRemark()) {
@@ -1500,7 +1538,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 
         List<EsmUserImageVo> esmUserImageVo = sysUserVo.getEsmUserImageVo();
         String finalUserId = userId;
-        List<EsmUserImage> esmUserImages = esmUserImageVo.stream().map(x -> new EsmUserImage(x, finalUserId)).collect(Collectors.toList());
+        List<EsmUserImage> esmUserImages = esmUserImageVo.stream()
+                .map(x -> new EsmUserImage(x, finalUserId))
+                .collect(Collectors.toList());
         esmUserImageService.saveBatch(esmUserImages);
 
         if (UserWorkStatus.UWS_5.getCode() == beStatus ||
@@ -1591,7 +1631,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
                 updateById(sysUser);
             }
 
-            if(StringUtils.isEmpty(sysUser.getLeaderId())){
+            if (StringUtils.isEmpty(sysUser.getLeaderId())) {
                 SysUser leaderUser = baseMapper.getByRoleIdAndDeptId("21", sysUser.getDeptId());
                 sysUser.setLeaderId(leaderUser.getLeaderId());
                 sysUser.setLeaderName(leaderUser.getLeaderName());
@@ -1604,7 +1644,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 
             SysDept sysDept = sysDeptService.getById(sysUser.getDeptId());
             // 渠道负责人更新数据
-            if (ManagementSource.MS_01.getCode().equals(sysDept.getManagementSource()) && "21".equals(sysUser.getRoleId())) {
+            if (ManagementSource.MS_01.getCode()
+                    .equals(sysDept.getManagementSource()) && "21".equals(sysUser.getRoleId())) {
                 boolean update = lambdaUpdate()
                         .set(SysUser::getLeaderId, sysUser.getLeaderId())
                         .set(SysUser::getLeaderName, sysUser.getLeaderName())
@@ -1635,7 +1676,10 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             //用户详情信息
             SysUserInfo sysUserInfo = sysUserVo.getSysUserInfo();
             if (null != sysUserInfo.getLiveAddressString() && sysUserInfo.getLiveAddressString().length > 0) {
-                sysUserVo.getSysUserInfo().setLiveAddress(Arrays.stream(sysUserInfo.getLiveAddressString()).map(item -> item.toString()).collect(Collectors.joining(",")));
+                sysUserVo.getSysUserInfo()
+                        .setLiveAddress(Arrays.stream(sysUserInfo.getLiveAddressString())
+                                .map(item -> item.toString())
+                                .collect(Collectors.joining(",")));
             }
             sysUserInfo.setId(userId);
             if (null == sysUserInfo.getRemark()) {
@@ -1650,7 +1694,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 
         List<EsmUserImageVo> esmUserImageVo = sysUserVo.getEsmUserImageVo();
         String finalUserId = userId;
-        List<EsmUserImage> esmUserImages = esmUserImageVo.stream().map(x -> new EsmUserImage(x, finalUserId)).collect(Collectors.toList());
+        List<EsmUserImage> esmUserImages = esmUserImageVo.stream()
+                .map(x -> new EsmUserImage(x, finalUserId))
+                .collect(Collectors.toList());
         esmUserImageService.saveBatch(esmUserImages);
 
         if (UserWorkStatus.UWS_5.getCode() == beStatus ||
@@ -2081,8 +2127,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
                 StringUtils.isNotEmpty(sysUserVOExt.getMobile()) || StringUtils.isNotEmpty(sysUserVOExt.getName())) {
             List<SysUserBaseVO> allUsersByHospitality = super.baseMapper.getAllUsersByHospitality(sysUserVOExt);
             //数据隔离操作
-            List<SysUserBaseVO> divideUserInfo = this.dataDivide(allUsersByHospitality);
-            return divideUserInfo;
+            return this.dataDivide(allUsersByHospitality);
         }
         return new ArrayList<SysUserBaseVO>();
     }
@@ -2093,20 +2138,21 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         if ("admin".equals(landerInfo.getId()) || "99D1501".equals(landerInfo.getId())) {
             return allUsersByHospitality;
         }
+        List<SysUser> userList = super.baseMapper.queryByBusinessGrouping(landerInfo.getId());
+        if (CollectionUtils.isEmpty(userList)) {
+            userList = super.baseMapper.queryUpTheLeader(landerInfo.getId());
+            userList.add(landerInfo);
+        }
 
-        List<SysUser> userList = super.baseMapper.queryUpTheLeader(landerInfo.getId());
-        userList.add(landerInfo);
         //获取查询结果id
         List<String> userIds = userList.stream()
                 .filter(user -> !StringUtils.isNullOrEmpty(user) && StringUtils.isNotEmpty(user.getId()))
                 .map(SysUser::getId).collect(Collectors.toList());
 
-        List<SysUserBaseVO> divideUserInfo = allUsersByHospitality.stream()
+        return allUsersByHospitality.stream()
                 .filter(allUser -> !StringUtils.isNullOrEmpty(allUser) && StringUtils.isNotEmpty(allUser.getLeaderId())
                         && userIds.contains(allUser.getLeaderId()))
                 .collect(Collectors.toList());
-
-        return divideUserInfo;
     }
 
     /**
@@ -2598,9 +2644,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
      */
     @Override
     public List<SysUser> findDxUserList(String type) {
-        if("1".equals(type)){
+        if ("1".equals(type)) {
             return sysUserMapper.findDxUserList();
-        }else if("2".equals(type)){
+        } else if ("2".equals(type)) {
             return sysUserMapper.findDxZyUserList();
         }
         return sysUserMapper.findDxUserList();
@@ -2633,7 +2679,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         lqw.orderByAsc(SysDept::getOrderNum);
         List<SysDept> sysDeptList = sysDeptMapper.selectList(lqw);
         List<SysDeptTreeVo> sysDeptTreeVos = BeanUtil.copyToList(sysDeptList, SysDeptTreeVo.class);
-        Map<String, List<SysDeptTreeVo>> map = sysDeptTreeVos.stream().sorted(Comparator.comparing(SysDeptTreeVo::getId)).collect(Collectors.groupingBy(SysDeptTreeVo::getParentId));
+        Map<String, List<SysDeptTreeVo>> map = sysDeptTreeVos.stream()
+                .sorted(Comparator.comparing(SysDeptTreeVo::getId))
+                .collect(Collectors.groupingBy(SysDeptTreeVo::getParentId));
         sysDeptTreeVos.forEach(i -> {
             if (map.get(i.getId()) == null) {
                 List<SysUser> orDefault = groupedByDeptId.getOrDefault(i.getId(), new ArrayList<>());
@@ -2819,7 +2867,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 
         List<EsmUserImageVo> esmUserImageVo = dto.getEsmUserImageVo();
         String finalUserId = user.getId();
-        List<EsmUserImage> esmUserImages = esmUserImageVo.stream().map(x -> new EsmUserImage(x, finalUserId)).collect(Collectors.toList());
+        List<EsmUserImage> esmUserImages = esmUserImageVo.stream()
+                .map(x -> new EsmUserImage(x, finalUserId))
+                .collect(Collectors.toList());
         esmUserImageService.saveBatch(esmUserImages);
         // 保存个代认证轨迹
         SpringUtil.getBean(UserAgentTrackUtils.class).addTrack(
@@ -2881,7 +2931,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             sysUserBankCardVO.setPhoneNo(user.getMobile());
             sysUserBankCardVO.setRealUserName(user.getName());
             sysUserBankCardVO.setUserName(user.getName());
-            bankCardService.insertByBankNumber(sysUserBankCardVO,false);
+            bankCardService.insertByBankNumber(sysUserBankCardVO, false);
         }
         // 保存个代银行卡认证轨迹
         SpringUtil.getBean(UserAgentTrackUtils.class).addTrack(
@@ -2903,7 +2953,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 
         List<EsmUserImageVo> esmUserImageVo = dto.getEsmUserImageVo();
         String finalUserId = user.getId();
-        List<EsmUserImage> esmUserImages = esmUserImageVo.stream().map(x -> new EsmUserImage(x, finalUserId)).collect(Collectors.toList());
+        List<EsmUserImage> esmUserImages = esmUserImageVo.stream()
+                .map(x -> new EsmUserImage(x, finalUserId))
+                .collect(Collectors.toList());
         esmUserImageService.saveBatch(esmUserImages);
     }
 
@@ -2913,9 +2965,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     }
 
     /**
-     *
      * @param managementSource
-     * @return  该人员下 的子集如果是电销 或者 代理人 或者 渠道则 显示
+     * @return 该人员下 的子集如果是电销 或者 代理人 或者 渠道则 显示
      */
     @Override
     public List<SysUser> findNextTreeContain(String managementSource) {
@@ -2928,7 +2979,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         queryWrapper.isNotNull("leader_id");
 
         HashMap<String, Object> params = new HashMap<>();
-        params.put("managementSource",managementSource);
+        params.put("managementSource", managementSource);
         List<SysUser> users = sysUserMapper.selectByParams(params);
 
         for (SysUser user : users) {
@@ -2939,14 +2990,14 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         }
         List<SysUser> topUsers = new ArrayList<>(); //存放1级用户,即没有直接上级的用户
         // 根据组织结构展示级别，筛选顶层节点并构建组织结构树
-        if("admin".equals(sysUser.getName())){
+        if ("admin".equals(sysUser.getName())) {
             topUsers.add(sysUserMapper.selectById("99D1501"));
-        }else {
+        } else {
             this.appendName(sysUser);
             topUsers.add(sysUser);
         }
         // 递归构建用户树结构
-        buildUserTreeContain(topUsers, users,managementSource);
+        buildUserTreeContain(topUsers, users, managementSource);
         return topUsers;
 
     }
@@ -2965,7 +3016,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         sysUser.setPassword("123456");
         sysUser.setRoleId("20");
         sysUser.setRoleName("代理人");
-        sysUser.setName("新增用户"+phone);
+        sysUser.setName("新增用户" + phone);
         sysUser2Vo.setSysUser(sysUser);
         sysUserInfo.setSex("U");
         sysUser2Vo.setSysUserInfo(sysUserInfo);
@@ -2981,6 +3032,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 
     /**
      * 拼接机构来源
+     *
      * @param user
      */
     private void appendName(SysUser user) {
@@ -3008,10 +3060,11 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
                         stringBuilder.append("(").append(dept1.getName()).append(dept2.getName()).append(")");
                     }
                 }
-                user.setName(user.getName()+stringBuilder.toString());
+                user.setName(user.getName() + stringBuilder.toString());
             }
         }
     }
+
     private void buildUserTreeContain(List<SysUser> topUsers, List<SysUser> users, String managementSource) {
         for (SysUser user : topUsers) {
             List<SysUser> children = new ArrayList<>();
@@ -3019,14 +3072,14 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
                 if (user.getId().equals(childUser.getLeaderId())) {
                     children.add(childUser);
                     // 递归查找下一级
-                    buildUserTreeContain(children, users,managementSource);
+                    buildUserTreeContain(children, users, managementSource);
                 }
             }
             user.setChildren(children);
         }
     }
 
-    public HttpResult userLogout(String userId){
+    public HttpResult userLogout(String userId) {
         SysUser sysUser = sysUserMapper.getByUserId(userId);
         if (sysUser == null) {
             throw new SystemException("账号不存在");
@@ -3037,16 +3090,17 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         }
 
         sysUser.setIdentity(sysUser.getIdentity() + "1");
-        sysUser.setMobile(sysUser.getMobile() +"1");
+        sysUser.setMobile(sysUser.getMobile() + "1");
         sysUser.setStatus(9);  //注销状态
         sysUserMapper.updateById(sysUser);
         return HttpResult.ok("账号注销成功");
     }
+
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2025/1/18 18:17
-     *  @Description:  转部门
+     * @version
+     * @author: hxl
+     * @Date: 2025/1/18 18:17
+     * @Description: 转部门
      */
     @Transactional
     @Override
@@ -3056,26 +3110,26 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         String identity = sysUser.getIdentity();
         String identityTime = sysUser.getIdentityTime();
         String mobile = sysUser.getMobile();
-        sysUser.setIdentity(identity+"-zc");
+        sysUser.setIdentity(identity + "-zc");
         //sysUser.setIdentityTime(null);
-        sysUser.setMobile(mobile+"-zc");
-        if(StringUtils.isBlank(transferUserVo.getDeptId())){
-           throw new SystemException("转入部门不能为空！");
+        sysUser.setMobile(mobile + "-zc");
+        if (StringUtils.isBlank(transferUserVo.getDeptId())) {
+            throw new SystemException("转入部门不能为空！");
         }
-        if(transferUserVo.getDeptId().equals("9")){
+        if (transferUserVo.getDeptId().equals("9")) {
             throw new SystemException("转入部门不能为总部！");
         }
-        if(transferUserVo.getDeptId().equals(sysUser.getDeptId())){
+        if (transferUserVo.getDeptId().equals(sysUser.getDeptId())) {
             throw new SystemException("转入部门和用户当前部门一致，请重新选择");
         }
         SysDept dept = sysDeptMapper.selectById(transferUserVo.getDeptId());
-        if(dept.getDeptType()!=null && ("C".equals(dept.getDeptType()) || "M".equals(dept.getDeptType()))) {
-           throw new SystemException("转入部门为子公司或者门店，请重新选择");
+        if (dept.getDeptType() != null && ("C".equals(dept.getDeptType()) || "M".equals(dept.getDeptType()))) {
+            throw new SystemException("转入部门为子公司或者门店，请重新选择");
         }
-        if(dept.getManagementSource()!=null && ("1".equals(dept.getManagementSource()) || "2".equals(dept.getManagementSource()) || "3".equals(dept.getManagementSource()))){
+        if (dept.getManagementSource() != null && ("1".equals(dept.getManagementSource()) || "2".equals(dept.getManagementSource()) || "3".equals(dept.getManagementSource()))) {
             throw new SystemException("转入部门类型不能为渠道、电销、个代，请重新选择");
         }
-        if(sysUser.getType()!=null && sysUser.getType()!=0){
+        if (sysUser.getType() != null && sysUser.getType() != 0) {
             throw new SystemException("非后线人员不能转出");
         }
         //2.将原先的用户设置为离司
@@ -3083,7 +3137,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         this.saveOrUpdate(sysUser);
         //3.重新生成用户id保存用户为入司待审核
         int noCount = 3;
-        String nextPK="";
+        String nextPK = "";
         String maxId = findNewMaxId(transferUserVo.getDeptId());
         if (StringUtils.isNullOrEmpty(maxId) || "0".equals(maxId)) {
             nextPK = transferUserVo.getDeptId() + "001";
@@ -3116,7 +3170,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         sysUserInfoService.save(userInfo);
         //6.添加影像
         List<EsmUserImage> list = esmUserImageService.getEsmUserByUserId(transferUserVo.getUserId());
-        if(list!=null && !list.isEmpty()){
+        if (list != null && !list.isEmpty()) {
             String finalNextPK = nextPK;
             list.stream().forEach(item -> {
                 item.setUserId(finalNextPK);
@@ -3128,10 +3182,10 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     }
 
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2025/1/21 9:28
-     *  @Description:  获取部门最大的id
+     * @version
+     * @author: hxl
+     * @Date: 2025/1/21 9:28
+     * @Description: 获取部门最大的id
      */
     @Override
     public String findNewMaxId(String deptId) {

src/main/resources/mapper/modules/admin/SysBusinessGroupingMapper.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ydtech.modules.admin.dao.SysBusinessGroupingMapper">
+
+    <resultMap id="BaseResultMap" type="com.ydtech.modules.admin.model.po.SysBusinessGrouping">
+            <id property="id" column="id" jdbcType="INTEGER"/>
+            <result property="groupingId" column="grouping_id" jdbcType="INTEGER"/>
+            <result property="userId" column="user_id" jdbcType="VARCHAR"/>
+            <result property="userName" column="user_name" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        id,grouping_id,user_id,
+        user_name
+    </sql>
+
+
+</mapper>

src/main/resources/mapper/modules/admin/SysUserMapper.xml

@@ -2113,6 +2113,15 @@
         SELECT * FROM Subordinates;
     </select>
 
+    <select id="queryByBusinessGrouping" resultType="com.ydtech.modules.admin.model.SysUser">
+        SELECT u.*
+        FROM sys_user u
+                 INNER JOIN sys_business_grouping bg1 ON u.id = bg1.user_id
+                 INNER JOIN sys_business_grouping bg2
+                            ON bg1.grouping_id = bg2.grouping_id
+                                AND bg2.user_id = #{userId}
+    </select>
+
     <select id="findDxZyUserList" resultType="com.ydtech.modules.admin.model.SysUser">
         SELECT t1.id   AS id,
                t1.NAME AS NAME

src/test/java/Test.java

@@ -1,5 +1,9 @@
 import com.ydtech.SpringInsApplication;
+import com.ydtech.modules.admin.service.SysRoleService;
+import com.ydtech.modules.admin.service.SysUserInfoService;
+import com.ydtech.modules.admin.service.SysUserService;
 import com.ydtech.modules.fee.service.FeeRuleSchemeNewService;
+import com.ydtech.modules.fee.service.FeeRuleSchemeService;
 import com.ydtech.modules.order.entity.InsAreaCompany;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;