修改电销分配管理人出现同名人选择错误bug修复

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

@@ -3,7 +3,6 @@ package com.ydtech.modules.admin.controller;
 
 import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.extra.spring.SpringUtil;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -19,9 +18,6 @@ import com.ydtech.modules.admin.components.request.UnionPayRequest;
 import com.ydtech.modules.admin.components.response.UnionPayResponse;
 import com.ydtech.modules.admin.constants.RoleConstants;
 import com.ydtech.modules.admin.constants.UserWorkStatus;
-import com.ydtech.modules.admin.dao.SysAgencyLeaderMapper;
-import com.ydtech.modules.admin.dao.SysPartnerMapper;
-import com.ydtech.modules.admin.dao.SysUserMapper;
 import com.ydtech.modules.admin.dao.SysUserRecordMapper;
 import com.ydtech.modules.admin.model.*;
 import com.ydtech.modules.admin.model.dto.*;
@@ -52,7 +48,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
-import io.swagger.models.auth.In;
 import jodd.util.StringUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -63,7 +58,6 @@ import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
 import javax.validation.Valid;
 import java.time.LocalDate;
 import java.util.*;
@@ -1319,8 +1313,8 @@ public class SysUserController extends BaseController {
      */
     @ApiOperation(value = "电销管理人数据列表")
     @GetMapping(value = "/findDxUserList")
-    public HttpResult findDxUserList() {
-        return HttpResult.ok(sysUserService.findDxUserList());
+    public HttpResult findDxUserList(String type) {
+        return HttpResult.ok(sysUserService.findDxUserList(type));
     }
 
 }

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

@@ -10,7 +10,6 @@ import com.ydtech.modules.admin.model.dto.*;
 import com.ydtech.modules.admin.model.report.user.QianLineQDPersonnelReportDto;
 import com.ydtech.modules.admin.model.vo.*;
 import com.ydtech.modules.base.model.dto.PageDto;
-import com.ydtech.modules.order.entity.BasePageResult;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import org.springframework.stereotype.Repository;
@@ -539,6 +538,15 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
      * 根据登陆者 id deptId 查询
      */
     List<SysUser> selectLeaderBylanderInfo(@Param("deptId") String deptId, @Param("leaderId") String leaderId, @Param("userId") String userId);
+
+
+    /**
+     * @version
+     * @author: hxl
+     * @Date: 2024/9/24 17:35
+     * @Description: 查询电销的管理人列表
+     */
+    List<SysUser> findDxZyUserList();
 }
 
 

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

@@ -14,10 +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;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -276,7 +273,7 @@ public interface SysUserService extends BaseIService<SysUser> {
      *  @Date: 2024/9/24 17:35
      *  @Description:  查询电销的管理人列表
      */
-    List<SysUser> findDxUserList();
+    List<SysUser> findDxUserList(String type);
 
     List<Map<String,String>>  selectHxUserList(SysUserDto sysUserDto);
 

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

@@ -60,7 +60,6 @@ import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
 
 import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
 import java.io.*;
 import java.math.BigDecimal;
 import java.net.HttpURLConnection;
@@ -2482,7 +2481,12 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
      * @Description: 电销管理人数据
      */
     @Override
-    public List<SysUser> findDxUserList() {
+    public List<SysUser> findDxUserList(String type) {
+        if("1".equals(type)){
+            return sysUserMapper.findDxUserList();
+        }else if("2".equals(type)){
+            return sysUserMapper.findDxZyUserList();
+        }
         return sysUserMapper.findDxUserList();
     }
 

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

@@ -2080,4 +2080,14 @@
             AND su.id NOT LIKE '%M%'
         </where>
     </select>
+
+    <select id="findDxZyUserList" resultType="com.ydtech.modules.admin.model.SysUser">
+        SELECT t1.id   AS id,
+               t1.NAME AS NAME
+        FROM sys_user t1
+                 LEFT JOIN sys_dept t2 ON t1.dept_id = t2.id
+        WHERE t1.`status` = 1
+          AND t1.id LIKE '%M%'
+          AND t2.management_source = 3
+    </select>
 </mapper>