1.添加电销组员不能提现逻辑

2.添加电销组员钱给组长
3.添加机构设置负责人

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

@@ -452,7 +452,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     public List<SysUserVO> findListByDeptId(SysUser sysUser) {
         return super.baseMapper.findListByDeptId(sysUser);
     }
-  @Override
+
+    @Override
     public List<SysUserVO> findListByDeptIdNew(SysUser sysUser) {
         return super.baseMapper.findListByDeptIdNew(sysUser);
     }
@@ -605,7 +606,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         } else {
             return HttpResult.error("密码不能为空");
         }
-        String userId="";
+        String userId = "";
         if ("19".equals(sysUser.getRoleId())) {//19 出单员 校验机构和业务员机构是否一致
             // add by  hxl  2024-08-20
             // return checkChuDanUser(sysUser);
@@ -634,7 +635,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             SysUserInfo userInfo = sysUserVo.getSysUserInfo();
             userInfo.setId(sysUser.getId());
             sysUserInfoService.save(userInfo);
-        }else{
+        } else {
             userId = gainNextUserId(sysUser.getDeptId());
 
             if (RoleConstants.R22.getCode().equals(sysUser.getRoleId())) {//22	后线人员
@@ -660,8 +661,8 @@ 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(",")));
+                if (null != userInfo.getLiveAddressString() && userInfo.getLiveAddressString().length > 0) {
+                    sysUserVo.getSysUserInfo().setLiveAddress(Arrays.stream(userInfo.getLiveAddressString()).map(item -> item.toString()).collect(Collectors.joining(",")));
                 }
                 userInfo.setId(sysUser.getId());
             }
@@ -672,7 +673,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         String finalUserId = userId;
         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());
+        SpringUtil.getBean(RecordUserUtils.class).addRecord(userId, BaseController.getUserName());
         return HttpResult.ok("新增成功");
     }
 
@@ -780,7 +781,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             SysUserInfo sysUserInfo = sysUserVo.getSysUserInfo();
             sysUserInfo.setId(userId);
             sysUserInfoService.saveOrUpdate(sysUserInfo);
-        }else{
+        } else {
             sysUser.setStatus(sysUserVo.getSysUser().getStatus());
             updateById(sysUser);
 
@@ -798,8 +799,8 @@ 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(",")));
+            if (null != sysUserInfo.getLiveAddressString() && sysUserInfo.getLiveAddressString().length > 0) {
+                sysUserVo.getSysUserInfo().setLiveAddress(Arrays.stream(sysUserInfo.getLiveAddressString()).map(item -> item.toString()).collect(Collectors.joining(",")));
             }
             sysUserInfo.setId(userId);
             if (null == sysUserInfo.getRemark()) {
@@ -830,7 +831,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             sysUserTrack.setApproveTime(new Date());
             sysUserTrackService.save(sysUserTrack);
         }
-        SpringUtil.getBean(RecordUserUtils.class).recordUser(sysUserVo,BaseController.getUserName());
+        SpringUtil.getBean(RecordUserUtils.class).recordUser(sysUserVo, BaseController.getUserName());
         return HttpResult.ok("修改成功");
     }
 
@@ -1617,7 +1618,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     }
 
     @Override
-    public SysUser getByUserId(String userid){
+    public SysUser getByUserId(String userid) {
         return baseMapper.getByUserId(userid);
     }
 
@@ -1647,52 +1648,55 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             return topUsers;
         }
     }
+
     @Override
     public List<SysUser> findNextAgentTree(String pid) {
         //查询所有的代理人
         //查询绑定的区域的代理人信息
         String userId = BaseController.getUser().getId();
 
-        if("admin".equals(userId)){
-            return sysUserMapper.getAllAgent(pid,null);
+        if ("admin".equals(userId)) {
+            return sysUserMapper.getAllAgent(pid, null);
         }
 
         List<String> agentUserIds = new ArrayList<>();
         List<String> areaCodes = sysUserLinkAreaMapper.findAreaCodeByUserId(userId);
-        if (areaCodes != null && !areaCodes.isEmpty()){
+        if (areaCodes != null && !areaCodes.isEmpty()) {
             agentUserIds = sysUserLinkAreaMapper.findAreaIdsByAgentUserId(userId, areaCodes);
-            return  sysUserMapper.getAllAgent(pid,agentUserIds);
-        }else {
-            return  new ArrayList<>();
+            return sysUserMapper.getAllAgent(pid, agentUserIds);
+        } else {
+            return new ArrayList<>();
         }
     }
 
     @Override
-    public List<Map<String,String>>  selectHxUserList(SysUserDto sysUserDto) {
-        return sysUserMapper.selectHxUserList( sysUserDto);
+    public List<Map<String, String>> selectHxUserList(SysUserDto sysUserDto) {
+        return sysUserMapper.selectHxUserList(sysUserDto);
     }
 
     @Override
     public HttpResult cancelManagementPersonnel(UpdateManagementDto managementDto) {
         try {
-            if (CollectionUtils.isEmpty(managementDto.getUserIds())){
+            if (CollectionUtils.isEmpty(managementDto.getUserIds())) {
                 return HttpResult.error("用户数据不能为空");
             }
             return HttpResult.ok(baseMapper.cancelManagementPersonnel(managementDto));
-        }catch (Exception e){
+        } catch (Exception e) {
             log.error("取消管理人员出错{}" + e.getMessage());
             return HttpResult.error("取消失败");
         }
     }
 
+
+
     @Override
     public HttpResult updateManagementPersonnel(UpdateManagementDto managementDto) {
         try {
-            if (StringUtils.isEmpty(managementDto.getLeaderId()) && CollectionUtils.isEmpty(managementDto.getUserIds())){
+            if (StringUtils.isEmpty(managementDto.getLeaderId()) && CollectionUtils.isEmpty(managementDto.getUserIds())) {
                 return HttpResult.error("保存数据不能为空");
             }
             return HttpResult.ok(baseMapper.updateManagementPersonnel(managementDto));
-        }catch (Exception e){
+        } catch (Exception e) {
             log.error("批量更新管理人员出错{}" + e.getMessage());
             return HttpResult.error("更新失败");
         }
@@ -1701,19 +1705,30 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     @Override
     public IPage<SysUserBaseVO> selectForAgentsAndChannelsPage(PageDto<SysUserDto> pageDto) {
         SysUserDto sysUserVO = JSONObject.parseObject(JSONObject.toJSONString(pageDto.getDto()), SysUserDto.class);
-        if (StringUtils.isNotEmpty(sysUserVO.getNotSelected())){
+        if (StringUtils.isNotEmpty(sysUserVO.getNotSelected())) {
             sysUserVO.setLeaderId(null);
         }
         return sysUserMapper.selectForAgentsAndChannelsPage(new Page(pageDto.getPageNum(), pageDto.getPageSize()), sysUserVO);
     }
+
+    /**
+     * @version
+     * @author: hxl
+     * @Date: 2024/9/24 17:36
+     * @Description: 电销管理人数据
+     */
+    @Override
+    public List<SysUser> findDxUserList() {
+        return sysUserMapper.findDxUserList();
+    }
     /**
      *  @version
      *  @author: hxl
-     *  @Date: 2024/9/24 17:36
-     *  @Description: 电销管理人数据
+     *  @Date: 2024/9/25 19:23
+     *  @Description: 查询用户管理的电销组员
      */
     @Override
-    public List<SysUser> findDxUserList() {
-        return  sysUserMapper.findDxUserList();
+    public List<String> getGroupByUserId(String userId) {
+        return sysUserMapper.getGroupByUserId(userId);
     }
-}
+}