租户-业务管理-渠道管理bug修复

1. 对渠道下的用户进行启用，停用，删除的时候后台异常的问题
2. 完善相关的日志信息，并且让前端调整了传参的key。
3. 本地进行了问题修复以及前后端的联调验证
4. 移除没用的方法定义： com.jzg.organization.mapper.SysOrganizationMapper.getOrganizationManager

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

@@ -8,6 +8,7 @@ import com.jzg.commons.core.page.HttpResult;
 import com.jzg.commons.entity.dto.*;
 import com.jzg.commons.entity.po.SysOrganization;
 import com.jzg.commons.entity.vo.SysOrganizationUserLinkQueryVo;
+import com.jzg.commons.entity.vo.SysOrganizationUserLinkVo;
 import com.jzg.commons.util.idgen.IdGenerate;
 import com.jzg.organization.mapper.SysOrganizationMapper;
 import com.jzg.organization.service.SysOrganizationService;
@@ -115,12 +116,13 @@ public class SysOrganizationController {
 
     /**
      * 删除团队、电销、渠道关联的用户
-     * @param deleteAssociatedUsers
-     * @return
+     *
+     * @param deleteAssociatedUsers 删除所需的参数
+     * @return HttpResult<String>
      */
     @Operation(summary = "删除团队、电销、渠道关联的用户", description = "通过团队、电销、渠道删除")
     @PostMapping("deleteAssociatedUsers")
-    public HttpResult deleteAssociatedUsers(@Validated @RequestBody DeleteAssociatedUsers deleteAssociatedUsers){
+    public HttpResult<String> deleteAssociatedUsers(@Validated @RequestBody DeleteAssociatedUsers deleteAssociatedUsers){
         return sysOrganizationService.deleteAssociatedUsers(deleteAssociatedUsers);
     }
 
@@ -150,7 +152,7 @@ public class SysOrganizationController {
 
     @Operation(summary = "团队、渠道、电销组 人员查询")
     @PostMapping("getTeamUserPage")
-    public HttpResult getTeamUserPage(@Validated @RequestBody SysOrganizationUserLinkQueryVo sysOrganizationUserLinkQueryVo){
+    public HttpResult<Page<SysOrganizationUserLinkVo>> getTeamUserPage(@Validated @RequestBody SysOrganizationUserLinkQueryVo sysOrganizationUserLinkQueryVo){
         Page page = sysOrganizationUserLinkQueryVo.getPage();
         return HttpResult.ok(sysOrganizationService.getTeamUserPage(page,sysOrganizationUserLinkQueryVo));
     }

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

@@ -41,7 +41,7 @@ public class UserController extends BaseController {
 
     @Operation(summary = "分页获取业务员列表接口", description = "分页获取业务员列表接口")
     @PostMapping(value = "/getUserInfoList")
-    public HttpResult getUserInfoList(@RequestBody SysUserInfoListVo sysUserInfoListVo) {
+    public HttpResult<Page<SysUserJzgInfoDto>> getUserInfoList(@RequestBody SysUserInfoListVo sysUserInfoListVo) {
         Page page = sysUserInfoListVo.getPage();
         Page<SysUserJzgInfoDto> userInfoList = sysUserService.getUserInfoList(page, sysUserInfoListVo);
         return HttpResult.ok(userInfoList);

tenant/organization/src/main/java/com/jzg/organization/mapper/SysOrganizationMapper.java

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jzg.commons.entity.dto.SysOrganizationParam;
 import com.jzg.commons.entity.po.SysOrganization;
-import com.jzg.commons.entity.po.SysUserJzgInfo;
 import com.jzg.commons.entity.vo.*;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -14,16 +13,18 @@ import java.util.List;
 
 public interface SysOrganizationMapper extends BaseMapper<SysOrganization> {
 
-
-
-
     @Select("")
     SysOrganizationUserDetailsVo getDetails(Long userId);
 
-
     List<LeftSysOrganizationVo> selectLeftList(@Param("params") SysOrganizationParam sysOrganizationParam);
 
+    /**
+     * 获取团队下的人员列表分页
+     *
+     * @param sysOrganizationUserLinkQueryVo 查询参数
+     * @return Page<SysOrganizationUserLinkVo> 此次分页得到的满足条件的分页数据
+     * @author lipf 维护
+     * @date 2026年4月10日10:09:12
+     */
     Page<SysOrganizationUserLinkVo> getTeamUserPage(Page page, @Param("param")SysOrganizationUserLinkQueryVo sysOrganizationUserLinkQueryVo);
-
-    SysUserJzgInfo getOrganizationManager();
 }

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

@@ -5,10 +5,8 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.jzg.commons.core.page.HttpResult;
 import com.jzg.commons.entity.dto.*;
 import com.jzg.commons.entity.po.SysOrganization;
-import com.jzg.commons.entity.po.SysOrganizationUserLink;
 import com.jzg.commons.entity.vo.SysOrganizationUserLinkQueryVo;
 import com.jzg.commons.entity.vo.SysOrganizationUserLinkVo;
-import com.jzg.commons.entity.vo.SysOrganizationVo;
 
 public interface SysOrganizationService extends IService<SysOrganization> {
 
@@ -24,17 +22,26 @@ public interface SysOrganizationService extends IService<SysOrganization> {
 
     HttpResult setResponsiblePerson(SysOrganizationSetPerson setPerson);
 
-    HttpResult deleteAssociatedUsers(DeleteAssociatedUsers deleteAssociatedUsers);
+    /**
+     * 删除团队、电销、渠道关联的用户
+     *
+     * @param deleteAssociatedUsers 删除所需的参数
+     * @author lipf
+     * @return HttpResult<String>
+     */
+    HttpResult<String> deleteAssociatedUsers(DeleteAssociatedUsers deleteAssociatedUsers);
 
     HttpResult getDetails(Long userId);
 
     HttpResult updateByIdDelete(String id);
 
-
     /**
      * 获取团队下的人员列表分页
-     * @param sysOrganizationUserLinkQueryVo
-     * @return
+     *
+     * @param sysOrganizationUserLinkQueryVo 查询参数
+     * @return Page<SysOrganizationUserLinkVo> 此次分页得到的满足条件的分页数据
+     * @author lipf 维护
+     * @date 2026年4月10日10:09:12
      */
     Page<SysOrganizationUserLinkVo> getTeamUserPage(Page page,SysOrganizationUserLinkQueryVo sysOrganizationUserLinkQueryVo);
 }

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

@@ -12,7 +12,14 @@ public interface SysOrganizationUserLinkService extends IService<SysOrganization
 
     Long selectByOrgIdCount(String id);
 
-    HttpResult deleteAssociatedUsers(DeleteAssociatedUsers deleteAssociatedUsers);
+    /**
+     * 删除团队、电销、渠道关联的用户
+     *
+     * @param deleteAssociatedUsers 删除所需的参数
+     * @author lipf
+     * @return HttpResult<String>
+     */
+    HttpResult<String> deleteAssociatedUsers(DeleteAssociatedUsers deleteAssociatedUsers);
 
     SysOrganizationUserLink selectByOrgIdAndUserId(SysOrganizationUserLinkAdd organizationUserLinkAdd);
 

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

@@ -62,6 +62,14 @@ public interface SysUserService extends IService<SysUser> {
 
     HttpResult getUserInfoById(String id);
 
+    /**
+     * 分页获取业务员列表
+     *
+     * @param page 分页参数
+     * @param sysUserInfoListVo 查询参数
+     * @author lipf
+     * @date 2026/4/10 10:01
+     */
     Page<SysUserJzgInfoDto> getUserInfoList(Page page, SysUserInfoListVo sysUserInfoListVo);
 
     /**

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

@@ -1,8 +1,9 @@
 package com.jzg.organization.service.impl;
 
 
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjectUtil;
-import com.alibaba.fastjson2.JSONObject;
+import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -19,6 +20,8 @@ import com.jzg.commons.util.StringUtils;
 import com.jzg.organization.mapper.SysOrganizationMapper;
 import com.jzg.organization.service.SysOrganizationService;
 import com.jzg.organization.service.SysOrganizationUserLinkService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -28,6 +31,7 @@ import java.util.List;
 
 @Service
 public class SysOrganizationServiceImpl extends ServiceImpl<SysOrganizationMapper, SysOrganization> implements SysOrganizationService {
+    private static final Logger log = LoggerFactory.getLogger(SysOrganizationServiceImpl.class);
 
 
     @Autowired
@@ -104,8 +108,15 @@ public class SysOrganizationServiceImpl extends ServiceImpl<SysOrganizationMappe
         return HttpResult.error("所选团队、渠道、电销组不存在或以删除，请刷新");
     }
 
+    /**
+     * 删除团队、电销、渠道关联的用户
+     *
+     * @param deleteAssociatedUsers 删除所需的参数
+     * @author lipf
+     * @return HttpResult<String>
+     */
     @Override
-    public HttpResult deleteAssociatedUsers(DeleteAssociatedUsers deleteAssociatedUsers) {
+    public HttpResult<String> deleteAssociatedUsers(DeleteAssociatedUsers deleteAssociatedUsers) {
         return sysOrganizationUserLinkService.deleteAssociatedUsers(deleteAssociatedUsers);
     }
 
@@ -126,8 +137,19 @@ public class SysOrganizationServiceImpl extends ServiceImpl<SysOrganizationMappe
                 HttpResult.ok("删除成功") : HttpResult.error("删除失败");
     }
 
+    /**
+     * 获取团队下的人员列表分页
+     *
+     * @param sysOrganizationUserLinkQueryVo 查询参数
+     * @return Page<SysOrganizationUserLinkVo> 此次分页得到的满足条件的分页数据
+     * @author lipf 维护
+     * @date 2026年4月10日10:09:12
+     */
     @Override
     public Page<SysOrganizationUserLinkVo> getTeamUserPage(Page page,SysOrganizationUserLinkQueryVo sysOrganizationUserLinkQueryVo) {
-        return baseMapper.getTeamUserPage(page,sysOrganizationUserLinkQueryVo);
+        log.info("获取团队下的人员列表分页. sysOrganizationUserLinkQueryVo=[{}], page=[{}]", JSONUtil.toJsonStr(sysOrganizationUserLinkQueryVo), JSONUtil.toJsonStr(page));
+        Page<SysOrganizationUserLinkVo> teamUserPage = baseMapper.getTeamUserPage(page, sysOrganizationUserLinkQueryVo);
+        log.debug("获取团队下的人员列表分页.查询出[{}]个业务员。 sysOrganizationUserLinkQueryVo=[{}], page=[{}]", CollUtil.size(teamUserPage.getRecords()), JSONUtil.toJsonStr(sysOrganizationUserLinkQueryVo), JSONUtil.toJsonStr(page));
+        return teamUserPage;
     }
 }

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

@@ -1,5 +1,6 @@
 package com.jzg.organization.service.impl;
 
+import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jzg.commons.core.page.HttpResult;
@@ -8,12 +9,15 @@ import com.jzg.commons.entity.dto.SysOrganizationUserLinkAdd;
 import com.jzg.commons.entity.po.SysOrganizationUserLink;
 import com.jzg.organization.mapper.SysOrganizationUserLinkServiceMapper;
 import com.jzg.organization.service.SysOrganizationUserLinkService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 @Service
 public class SysOrganizationUserLinkServiceImpl extends ServiceImpl<SysOrganizationUserLinkServiceMapper, SysOrganizationUserLink> implements SysOrganizationUserLinkService{
 
+    private static final Logger log = LoggerFactory.getLogger(SysOrganizationUserLinkServiceImpl.class);
 
     @Autowired
     private SysOrganizationUserLinkServiceMapper sysOrganizationUserLinkServiceMapper;
@@ -23,11 +27,21 @@ public class SysOrganizationUserLinkServiceImpl extends ServiceImpl<SysOrganizat
         return sysOrganizationUserLinkServiceMapper.selectCount(new LambdaQueryWrapper<SysOrganizationUserLink>().eq(SysOrganizationUserLink::getOrganizationId, id));
     }
 
+    /**
+     * 删除团队、电销、渠道关联的用户
+     *
+     * @param deleteAssociatedUsers 删除所需的参数
+     * @author lipf
+     * @return HttpResult<String>
+     */
     @Override
-    public HttpResult deleteAssociatedUsers(DeleteAssociatedUsers deleteAssociatedUsers) {
-        return sysOrganizationUserLinkServiceMapper.delete(new LambdaQueryWrapper<SysOrganizationUserLink>().
+    public HttpResult<String> deleteAssociatedUsers(DeleteAssociatedUsers deleteAssociatedUsers) {
+        log.info("删除机构关联的用户信息: deleteAssociatedUsers=[{}]", JSONUtil.toJsonStr(deleteAssociatedUsers));
+        int count = sysOrganizationUserLinkServiceMapper.delete(new LambdaQueryWrapper<SysOrganizationUserLink>().
                 eq(SysOrganizationUserLink::getOrganizationId,deleteAssociatedUsers.getId()).
-                in(SysOrganizationUserLink::getUserId,deleteAssociatedUsers.getUserIds())) > 0 ? HttpResult.ok("删除成功") : HttpResult.error("删除失败");
+                in(SysOrganizationUserLink::getUserId,deleteAssociatedUsers.getUserIds()));
+        log.debug("删除机构关联的用户信息:删除[{}]个用户。deleteAssociatedUsers=[{}]", count, JSONUtil.toJsonStr(deleteAssociatedUsers));
+        return count > 0 ? HttpResult.ok("删除成功") : HttpResult.error("删除失败");
     }
 
     @Override

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

@@ -1,5 +1,6 @@
 package com.jzg.organization.service.impl;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -170,8 +171,17 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         return HttpResult.ok(baseMapper.getUserSelect(sysUserInfoListVo));
     }
 
+    /**
+     * 分页获取业务员列表
+     *
+     * @param page 分页参数
+     * @param sysUserInfoListVo 查询参数
+     * @author lipf
+     * @date 2026/4/10 10:01
+     */
     @Override
     public Page<SysUserJzgInfoDto> getUserInfoList(Page page, SysUserInfoListVo sysUserInfoListVo) {
+        log.info("获取业务员列表：查询参数： sysUserInfoListVo=[{}]", JSONUtil.toJsonStr(sysUserInfoListVo));
         if(Objects.nonNull(sysUserInfoListVo.getStatus()) && sysUserInfoListVo.getStatus() == 0){
             List<Integer> typeStatus = new ArrayList<>();
             sysUserInfoListVo.setStatus(null);
@@ -179,7 +189,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             typeStatus.add(UserState.UserStateEnum.RESIGN_ING.getValue());
             sysUserInfoListVo.setTypeStatus(typeStatus);
         }
-        return sysUserJzgInfoMapper.getUserInfoList(page, sysUserInfoListVo);
+        Page<SysUserJzgInfoDto> userInfoList = sysUserJzgInfoMapper.getUserInfoList(page, sysUserInfoListVo);
+        log.info("获取业务员列表：查询出[{}]个业务员。 查询参数： sysUserInfoListVo=[{}]", CollUtil.size(userInfoList.getRecords()),JSONUtil.toJsonStr(sysUserInfoListVo));
+        return userInfoList;
     }
 
     @Override