1.出单员带出负责人的管理人员

src/main/java/com/ydtech/modules/admin/controller/SysUserController.java

@@ -223,16 +223,17 @@ public class SysUserController extends BaseController {
 
         return HttpResult.ok();
     }
+
     @PostMapping(value = "/deleteUserRole")
     @ApiOperation(value = "删除用户角色信息")
     public HttpResult deleteUserRole(@RequestBody SysUserRoleVo sysUserRoleVo) {
 
-        if(StringUtil.isBlank(sysUserRoleVo.getUserId())){
+        if (StringUtil.isBlank(sysUserRoleVo.getUserId())) {
             return HttpResult.error("用户ID不能空");
         }
-        if(sysUserRoleService.deleteByUserId(sysUserRoleVo.getUserId())){
+        if (sysUserRoleService.deleteByUserId(sysUserRoleVo.getUserId())) {
             return HttpResult.ok();
-        }else{
+        } else {
             return HttpResult.error();
         }
     }
@@ -240,7 +241,7 @@ public class SysUserController extends BaseController {
     @PostMapping(value = "/roleAddUser")
     @ApiOperation(value = "角色成员新增")
     public HttpResult roleAddUser(@RequestBody @Valid SysRoleAddUserVo sysRoleAddUserVo) {
-        return sysUserRoleService.roleAddUser(sysRoleAddUserVo,getUserName());
+        return sysUserRoleService.roleAddUser(sysRoleAddUserVo, getUserName());
     }
 
 
@@ -301,6 +302,7 @@ public class SysUserController extends BaseController {
 
     /**
      * 合伙人密码修改
+     *
      * @param id
      * @param password
      * @param oldPassword
@@ -638,7 +640,7 @@ public class SysUserController extends BaseController {
             List<EsmUserImageQueryVo> esmUserImageQueryVo = esmUserImageService.getEsmUserImageQueryVo(userId);
             sysUserVo.setEsmUserImageVo(esmUserImageQueryVo);
             sysUserVo.setSysUserInfo(sysUserInfoService.getById(userId));
-            SpringUtil.getBean(RecordUserUtils.class).addRecord(userId,BaseController.getUserName());
+            SpringUtil.getBean(RecordUserUtils.class).addRecord(userId, BaseController.getUserName());
             return HttpResult.ok(sysUserVo);
         }
         // 查询推荐人
@@ -654,7 +656,7 @@ public class SysUserController extends BaseController {
         SysUserInfo userInfo = sysUserInfoService.getById(userId);
 
         String addr = Optional.ofNullable(userInfo).map(SysUserInfo::getLiveAddress).orElse(null);
-        if (StringUtils.isNotEmpty(addr)){
+        if (StringUtils.isNotEmpty(addr)) {
             userInfo.setLiveAddressString(addr.split(","));
         }
 
@@ -789,8 +791,8 @@ public class SysUserController extends BaseController {
             request.setPhoneNo(dto.getMobile());
             request.setCertNo(dto.getIdentity());
             response = unionPayRequestApiComponent.threeFactorVerifyRequest(request);
-            if (response != null&&!"00".equals(response.getRespCode())) {
-                return HttpResult.error("认证信息不一致:"+response.getDetailRespMsg());
+            if (response != null && !"00".equals(response.getRespCode())) {
+                return HttpResult.error("认证信息不一致:" + response.getDetailRespMsg());
             }
         }
         //只有团队长和代理人才能邀请 by gws
@@ -827,13 +829,21 @@ public class SysUserController extends BaseController {
             sysUser.setOperatorCode(recommenderid);
         }
         sysUser.setIdentity(dto.getIdentity());
-        sysUser.setFactorVerify(response != null && "00".equals(response.getRespCode())? 1:0);
-        sysUserService.save(sysUser);
+        sysUser.setFactorVerify(response != null && "00".equals(response.getRespCode()) ? 1 : 0);
 
         //角色配置
         SysUserRole userRole = new SysUserRole();
         userRole.setUserId(nextPK);
         userRole.setRoleId(dto.getFlag().equals("2") ? 20L : 19L);
+
+        // 出单员获取渠道负责人的领导人插入
+        if (19 == userRole.getRoleId()) {
+            SysUser leaderUser = sysUserService.getByRoleIdAndDeptId("21", sysUser.getDeptId());
+            sysUser.setLeaderId(leaderUser.getLeaderId());
+            sysUser.setLeaderName(leaderUser.getLeaderName());
+        }
+
+        sysUserService.save(sysUser);
         sysUserRoleService.save(userRole);
 
         //添加增员服务消息
@@ -917,7 +927,7 @@ public class SysUserController extends BaseController {
     @ApiOperation(value = "保存合伙人、管理员用户基本详情信息")
     @PostMapping(value = "/saveUserInfoByPartner")
     public HttpResult saveUserInfoByPartner(@RequestBody SysUser2Vo sysUserVo) {
-        log.info("添加合伙人入参：{}",sysUserVo);
+        log.info("添加合伙人入参：{}", sysUserVo);
         //by gws 21	团队长 20	代理人 必须归属团队
         // 22	后线人员 必须归属部门
         SysUser sysUser = sysUserVo.getSysUser();
@@ -1044,6 +1054,7 @@ public class SysUserController extends BaseController {
 
     /**
      * 获取当前用户的下级所有人员
+     *
      * @return
      */
     @ApiOperation(value = "获取当前用户的下级所有人员")
@@ -1055,12 +1066,13 @@ public class SysUserController extends BaseController {
 
     /**
      * 获取当前用户的所有代理人
+     *
      * @return
      */
     @ApiOperation(value = "获取代理人树形")
     @GetMapping(value = "/findNextAgentTree")
     public HttpResult<List<SysUser>> findNextAgentTree(String pid) {
-        List<SysUser> list = sysUserService.findNextAgentTree( pid);
+        List<SysUser> list = sysUserService.findNextAgentTree(pid);
         return HttpResult.ok(list);
     }
 
@@ -1125,6 +1137,7 @@ public class SysUserController extends BaseController {
         }
 
     }
+
     /**
      * @version
      * @author: whp
@@ -1199,7 +1212,7 @@ public class SysUserController extends BaseController {
     @GetMapping(value = "/getUserModificationRecords")
     public HttpResult getUserModificationRecords(@RequestParam("userId") String userId) throws IllegalAccessException {
         List<SysUserRecord> userList = SpringUtil.getBean(SysUserRecordMapper.class).queryByUserId(userId);
-        if (CollectionUtils.isEmpty(userList)){
+        if (CollectionUtils.isEmpty(userList)) {
             return HttpResult.ok(new ArrayList[0]);
         }
         SysUserInfoQuery sysUserVo = new SysUserInfoQuery();
@@ -1235,7 +1248,7 @@ public class SysUserController extends BaseController {
         }
         //查询详情信息
         SysUserInfo userInfo = sysUserInfoService.getById(userId);
-        if (StringUtils.isNotEmpty(userInfo.getLiveAddress())){
+        if (StringUtils.isNotEmpty(userInfo.getLiveAddress())) {
             userInfo.setLiveAddressString(userInfo.getLiveAddress().split(","));
         }
         //查询用户绑定的银行卡信息
@@ -1264,7 +1277,7 @@ public class SysUserController extends BaseController {
      * 代理人和渠道添加批量设置管理人
      */
     @PostMapping("updateManagementPersonnel")
-    public HttpResult updateManagementPersonnel(@RequestBody UpdateManagementDto managementDto){
+    public HttpResult updateManagementPersonnel(@RequestBody UpdateManagementDto managementDto) {
         return sysUserService.updateManagementPersonnel(managementDto);
     }
 
@@ -1273,7 +1286,7 @@ public class SysUserController extends BaseController {
      * 代理人和渠道取消管理人
      */
     @PostMapping("cancelManagementPersonnel")
-    public HttpResult cancelManagementPersonnel(@RequestBody UpdateManagementDto managementDto){
+    public HttpResult cancelManagementPersonnel(@RequestBody UpdateManagementDto managementDto) {
         return sysUserService.cancelManagementPersonnel(managementDto);
     }
 
@@ -1291,20 +1304,19 @@ public class SysUserController extends BaseController {
     }
 
 
-
     /**
      * 代理人和渠道用户查询
      */
     @PostMapping("selectForAgentsAndChannelsPage")
-    public HttpResult selectForAgentsAndChannelsPage(@RequestBody PageDto<SysUserDto> pageDto){
+    public HttpResult selectForAgentsAndChannelsPage(@RequestBody PageDto<SysUserDto> pageDto) {
         return HttpResult.ok(sysUserService.selectForAgentsAndChannelsPage(pageDto));
     }
 
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2024/9/24 17:37
-     *  @Description: 电销管理人数据列表
+     * @version
+     * @author: hxl
+     * @Date: 2024/9/24 17:37
+     * @Description: 电销管理人数据列表
      */
     @ApiOperation(value = "电销管理人数据列表")
     @GetMapping(value = "/findDxUserList")

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

@@ -442,71 +442,74 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
      * @return 电销人员工号列表
      */
     List<String> getTelemarketingPersonnelUserId();
+
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2024/8/29 17:52
-     *  @Description: 按照省市区查询数据
+     * @version
+     * @author: hxl
+     * @Date: 2024/8/29 17:52
+     * @Description: 按照省市区查询数据
      */
     List<QxFrontlineAgentDto> queryQxFrontlineAgentList(@Param("vo") QxFrontlineAgentVo qxFrontlineAgentVo);
 
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2024/8/30 18:47
-     *  @Description: 分页查询人员数据
+     * @version
+     * @author: hxl
+     * @Date: 2024/8/30 18:47
+     * @Description: 分页查询人员数据
      */
     Page<QxFrontlineAgentDto> findUserListByParam(@Param("page") Page page, @Param("vo") QxFrontlineAgentVo qxFrontlineAgentVo);
 
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2024/8/30 18:47
-     *  @Description: 更新
+     * @version
+     * @author: hxl
+     * @Date: 2024/8/30 18:47
+     * @Description: 更新
      */
     Integer updateManagementPersonnel(@Param("managementDto") UpdateManagementDto managementDto);
 
 
-    List<SysUser> getAllAgent(String pid ,  List<String>  ids);
+    List<SysUser> getAllAgent(String pid, List<String> ids);
 
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2024/9/24 17:35
-     *  @Description:  查询电销的管理人列表
+     * @version
+     * @author: hxl
+     * @Date: 2024/9/24 17:35
+     * @Description: 查询电销的管理人列表
      */
     List<SysUser> findDxUserList();
 
     /**
      * 根据部门获取代理人渠道数
+     *
      * @param sysUserDeptRelationshipVo
      * @return
      */
-    Page<SysUser> findQXDLUserListNew(@Param("page") Page page,@Param("vo") SysUserDeptRelationshipVo sysUserDeptRelationshipVo);
+    Page<SysUser> findQXDLUserListNew(@Param("page") Page page, @Param("vo") SysUserDeptRelationshipVo sysUserDeptRelationshipVo);
 
 
-    Page<SysUser>  getChanelList(@Param("page") Page page,@Param("vo") SysUserDeptRelationshipVo sysUserDeptRelationshipVo);
+    Page<SysUser> getChanelList(@Param("page") Page page, @Param("vo") SysUserDeptRelationshipVo sysUserDeptRelationshipVo);
 
     List<SysUser> selectByParams(HashMap<String, Object> params);
 
-    IPage<SysUserBaseVO> selectForAgentsAndChannelsPage(@Param("page") Page page,@Param("sysUserVO") SysUserDto sysUserVO);
+    IPage<SysUserBaseVO> selectForAgentsAndChannelsPage(@Param("page") Page page, @Param("sysUserVO") SysUserDto sysUserVO);
 
-    List<Map<String,String>> selectHxUserList(@Param("sysUserDto") SysUserDto sysUserDto);
+    List<Map<String, String>> selectHxUserList(@Param("sysUserDto") SysUserDto sysUserDto);
 
     Integer cancelManagementPersonnel(@Param("managementDto") UpdateManagementDto managementDto);
 
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2024/9/25 19:25
-     *  @Description: 通过用户id查询电销组下的用户id
+     * @version
+     * @author: hxl
+     * @Date: 2024/9/25 19:25
+     * @Description: 通过用户id查询电销组下的用户id
      */
     List<String> getGroupByUserId(@Param("userId") String userId);
+
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2024/9/26 18:11
-     *  @Description:  通过机构id查询后线用户数据
+     * @version
+     * @author: hxl
+     * @Date: 2024/9/26 18:11
+     * @Description: 通过机构id查询后线用户数据
      */
     List<SysUser> getLeadListDeptId(@Param("deptId") String deptId);
 
@@ -519,10 +522,19 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
     List<SysUser> findHxUserListNew();
 
 
-    AppUserInfoVo queryByUserId(@Param("userId")String userId);
+    AppUserInfoVo queryByUserId(@Param("userId") String userId);
 
     List<SysUser> selectByParamsTreeUser(HashMap<String, Object> params);
 
+    /**
+     * 通过 机构id 和 角色id查询用户
+     *
+     * @param roleId 角色id
+     * @param deptId 机构id
+     * @return 用户信息
+     */
+    SysUser getByRoleIdAndDeptId(@Param("roleId") String roleId, @Param("deptId") String deptId);
+
 }
 
 

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

@@ -14,6 +14,7 @@ import com.ydtech.modules.admin.model.dto.*;
 import com.ydtech.modules.admin.model.vo.*;
 import com.ydtech.modules.base.model.dto.PageDto;
 import com.ydtech.modules.base.model.vo.PageVo;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.web.bind.annotation.RequestParam;
 
 import javax.servlet.http.HttpServletRequest;
@@ -336,6 +337,15 @@ public interface SysUserService extends BaseIService<SysUser> {
      * @return
      */
     void agentSubmit(SysUser sysUser, AgentSubmitDto dto);
+
+    /**
+     *
+     * @param roleId 角色id
+     * @param deptId 机构id
+     * @return 用户信息
+     */
+    SysUser getByRoleIdAndDeptId(String roleId, String deptId);
+
 }
 
 

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

@@ -23,10 +23,7 @@ import com.ydtech.handler.CreateAndUpdateMetaObjectHandler;
 import com.ydtech.modules.admin.components.UnionPayRequestApiComponent;
 import com.ydtech.modules.admin.components.request.UnionPayRequest;
 import com.ydtech.modules.admin.components.response.UnionPayResponse;
-import com.ydtech.modules.admin.constants.QuMarks;
-import com.ydtech.modules.admin.constants.RoleConstants;
-import com.ydtech.modules.admin.constants.UserAgentStatus;
-import com.ydtech.modules.admin.constants.UserWorkStatus;
+import com.ydtech.modules.admin.constants.*;
 import com.ydtech.modules.admin.dao.SysDeptMapper;
 import com.ydtech.modules.admin.dao.SysPartnerMapper;
 import com.ydtech.modules.admin.dao.SysUserLinkAreaMapper;
@@ -51,6 +48,7 @@ import com.ydtech.modules.esm.service.EsmUserImageService;
 import com.ydtech.modules.esm.service.EsmUserReferrerService;
 import com.ydtech.modules.message.constants.MessageTypeConstants;
 import com.ydtech.modules.message.service.MessageSecretaryService;
+import com.ydtech.modules.protocol.utils.AssertionUtils;
 import com.ydtech.security.utils.PasswordUtils;
 import com.ydtech.utils.IDCardUtils;
 import com.ydtech.utils.StringUtils;
@@ -153,6 +151,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 
     @Value("${httpUrl}")
     private String httpUrl;
+
     @Override
     public IPage<SysUserBaseVO> findUserList(PageDto<SysUserDto> pageDto) {
         PageVo<SysUserBaseVO> pageVo = new PageVo();
@@ -325,15 +324,15 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             return HttpResult.error("手机号不能为空");
         }
 //            if ("0".equals(type)) {  // 0 登录 1 注册
-            SysUser sysUser = this.findByPhone(phone);
-            if (sysUser == null) {
-                return HttpResult.error("手机号不存在！");
-            }
+        SysUser sysUser = this.findByPhone(phone);
+        if (sysUser == null) {
+            return HttpResult.error("手机号不存在！");
+        }
 //            }
         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();
@@ -365,7 +364,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         Map params = new HashMap();//请求参数
         params.put("mobile", phone);//接收短信的手机号码
         params.put("tpl_id", "265910");//短信模板ID，请参考个人中心短信模板设置
-        params.put("vars",varsJson);
+        params.put("vars", varsJson);
         params.put("key", "fbe7b165e9e13e52f3b1f2654eab9c0e");//应用APPKEY(应用详细页查询)
         params.put("dtype", "json");//返回数据的格式,xml或json，默认json
 
@@ -967,14 +966,14 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             esmUserImageService.saveBatch(esmUserImages);
         }
         SpringUtil.getBean(RecordUserUtils.class).addRecord(userId, userId);
-        return HttpResult.ok("新增成功",sysUserMapper.selectById(userId));
+        return HttpResult.ok("新增成功", sysUserMapper.selectById(userId));
     }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
     public HttpResult saveUserInfo1(SysUser2Vo sysUserVo) {
 
-        log.info("添加团队入参：{}",sysUserVo);
+        log.info("添加团队入参：{}", sysUserVo);
         SysUser sysUser = sysUserVo.getSysUser();
         sysUser.setType(3);
         sysUser.setCreateTime(new Date());
@@ -1130,7 +1129,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             esmUserImageService.saveBatch(esmUserImages);
         }
         SpringUtil.getBean(RecordUserUtils.class).addRecord(userId, userId);
-        return HttpResult.ok("新增成功",sysUserMapper.selectById(userId));
+        return HttpResult.ok("新增成功", sysUserMapper.selectById(userId));
     }
 
     /**
@@ -1234,6 +1233,14 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
                 userId = sysUser.getId();
                 updateById(sysUser);
             }
+
+            if(StringUtils.isEmpty(sysUser.getLeaderId())){
+                SysUser leaderUser = baseMapper.getByRoleIdAndDeptId("21", sysUser.getDeptId());
+                sysUser.setLeaderId(leaderUser.getLeaderId());
+                sysUser.setLeaderName(leaderUser.getLeaderName());
+            }
+
+
             SysUserInfo sysUserInfo = sysUserVo.getSysUserInfo();
             sysUserInfo.setId(userId);
             sysUserInfoService.saveOrUpdate(sysUserInfo);
@@ -1241,6 +1248,17 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             sysUser.setStatus(sysUserVo.getSysUser().getStatus());
             updateById(sysUser);
 
+            SysDept sysDept = sysDeptService.getById(sysUser.getDeptId());
+            // 渠道负责人更新数据
+            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())
+                        .eq(SysUser::getDeptId, sysDept.getId())
+                        .update();
+                AssertionUtils.isSucceed(update, "出单员数据更新失败");
+            }
+
             //角色配置
             SysUserRole sysUserRole = sysUserRoleService.selectByUserId(userId);
             sysUserRole.setRoleId(StringUtils.toLong(sysUser.getRoleId()));
@@ -1361,10 +1379,29 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
                 userId = sysUser.getId();
                 updateById(sysUser);
             }
+
+            if(StringUtils.isEmpty(sysUser.getLeaderId())){
+                SysUser leaderUser = baseMapper.getByRoleIdAndDeptId("21", sysUser.getDeptId());
+                sysUser.setLeaderId(leaderUser.getLeaderId());
+                sysUser.setLeaderName(leaderUser.getLeaderName());
+            }
+
             SysUserInfo sysUserInfo = sysUserVo.getSysUserInfo();
             sysUserInfo.setId(userId);
             sysUserInfoService.saveOrUpdate(sysUserInfo);
         } else {
+
+            SysDept sysDept = sysDeptService.getById(sysUser.getDeptId());
+            // 渠道负责人更新数据
+            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())
+                        .eq(SysUser::getDeptId, sysDept.getId())
+                        .update();
+                AssertionUtils.isSucceed(update, "出单员数据更新失败");
+            }
+
             sysUser.setStatus(sysUserVo.getSysUser().getStatus());
             // 设置跳过填充
             CreateAndUpdateMetaObjectHandler.setSkipFill(true);
@@ -2291,7 +2328,6 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     }
 
 
-
     @Override
     public HttpResult updateManagementPersonnel(UpdateManagementDto managementDto) {
         try {
@@ -2324,11 +2360,12 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     public List<SysUser> findDxUserList() {
         return sysUserMapper.findDxUserList();
     }
+
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2024/9/25 19:23
-     *  @Description: 查询用户管理的电销组员
+     * @version
+     * @author: hxl
+     * @Date: 2024/9/25 19:23
+     * @Description: 查询用户管理的电销组员
      */
     @Override
     public List<String> getGroupByUserId(String userId) {
@@ -2353,11 +2390,11 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         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));
         sysDeptTreeVos.forEach(i -> {
-            if(map.get(i.getId()) ==null ){
+            if (map.get(i.getId()) == null) {
                 List<SysUser> orDefault = groupedByDeptId.getOrDefault(i.getId(), new ArrayList<>());
                 List<SysDeptTreeVo> sysDeptTreeVos1 = BeanUtil.copyToList(orDefault, SysDeptTreeVo.class);
                 i.setChildren(sysDeptTreeVos1);
-            }else {
+            } else {
                 i.setChildren(map.getOrDefault(i.getId(), new ArrayList<>()));
                 i.setDeptCount(i.getChildren().size());
             }
@@ -2366,8 +2403,10 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 
         return sysDeptTreeVos;
     }
+
     /**
      * 获取人员数
+     *
      * @return
      */
     @Override
@@ -2403,7 +2442,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
                 sysPartnerDto.setLevel(sysUser.getLevel());
                 sysPartnerService.insert(sysPartnerDto);
             }
-        } else if (type == 2){
+        } else if (type == 2) {
             SysDept sysDept = sysDeptService.getById(sysUser.getDeptId());
             SysDept sysDeptParent = sysDeptService.getById(sysDept.getParentId());
             SysUser sysUserReferrerId = this.getById(sysUser.getReferrerId());
@@ -2446,7 +2485,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         int noCount = 3;
         //根据机构号获取userid最大值，不需要加人员类型判断  从sys_user获取
         String maxId = this.findMaxId(recommender.getDeptId());
-        String nextPK = StringUtils.isNullOrEmpty(maxId)? recommender.getDeptId() + "001"
+        String nextPK = StringUtils.isNullOrEmpty(maxId) ? recommender.getDeptId() + "001"
                 : IdGenerate.nextCode(maxId, noCount);
         SysUser sysUser = new SysUser();
         sysUser.setId(nextPK);
@@ -2496,13 +2535,13 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         request.setPhoneNo(dto.getMobile());
         request.setCertNo(dto.getIdentity());
         UnionPayResponse response = unionPayRequestApiComponent.threeFactorVerifyRequest(request);
-        if (response != null&&!"00".equals(response.getRespCode())) {
-            msg = "认证信息不一致:"+response.getDetailRespMsg();
+        if (response != null && !"00".equals(response.getRespCode())) {
+            msg = "认证信息不一致:" + response.getDetailRespMsg();
             status = UserAgentStatus.UAS_2.getCode();
             user.setFactorVerify(2); // 认证失败 即未认证状态
             userAgentVo.setStatus(status);
             userAgentVo.setDesc(msg);
-        }else{
+        } else {
             msg = "认证成功";
             status = UserAgentStatus.UAS_1.getCode();
             user.setFactorVerify(1);
@@ -2548,7 +2587,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         SysUserInfo info = sysUserInfoService.getById(sysUser.getId());
         SysUserAgentVo userAgentVo = new SysUserAgentVo();
         userAgentVo.setSysUser(user);
-        if (Objects.nonNull(info)){
+        if (Objects.nonNull(info)) {
             userAgentVo.setSysUserInfo(info);
         }
 
@@ -2558,11 +2597,11 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             if (Objects.nonNull(track)) {
                 userAgentVo.setDesc(track.getApproveMess());
             }
-        } else if(UserWorkStatus.UWS_3.getCode().equals(user.getStatus())){
-            userAgentVo.setDesc(sysUserTrackService.getApproveMessByUserId(sysUser.getId(),"1"));
+        } else if (UserWorkStatus.UWS_3.getCode().equals(user.getStatus())) {
+            userAgentVo.setDesc(sysUserTrackService.getApproveMessByUserId(sysUser.getId(), "1"));
         }
         List<EsmUserImageQueryVo> esmUserImageQueryVo = esmUserImageService.getEsmUserImageQueryVo(sysUser.getId());
-        if(CollUtil.isNotEmpty(esmUserImageQueryVo)){
+        if (CollUtil.isNotEmpty(esmUserImageQueryVo)) {
             userAgentVo.setEsmUserImageVo(esmUserImageQueryVo);
         }
         return userAgentVo;
@@ -2581,10 +2620,10 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         UnionPayResponse response = unionPayRequestApiComponent.bankCardVerifyRequest(request);
         String msg;
         Integer status;
-        if (response != null&&!"00".equals(response.getRespCode())) {
-            msg = "认证信息不一致:"+response.getDetailRespMsg();
+        if (response != null && !"00".equals(response.getRespCode())) {
+            msg = "认证信息不一致:" + response.getDetailRespMsg();
             status = UserAgentStatus.UAS_4.getCode();
-        }else{
+        } else {
             msg = "银行卡认证成功";
             status = UserAgentStatus.UAS_3.getCode();
             SysUserBankCardVO sysUserBankCardVO = new SysUserBankCardVO();
@@ -2620,4 +2659,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         esmUserImageService.saveBatch(esmUserImages);
     }
 
+    @Override
+    public SysUser getByRoleIdAndDeptId(String roleId, String deptId) {
+        return baseMapper.getByRoleIdAndDeptId(roleId, deptId);
+    }
 }