Merge remote-tracking branch 'origin/test' into test

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

@@ -1053,4 +1053,16 @@ public class SysUserController extends BaseController {
         return sysUserService.selectForAgentsAndChannelsPage(agentsAndChannelsDto);
     }
 
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2024/9/24 17:37
+     *  @Description: 电销管理人数据列表
+     */
+    @ApiOperation(value = "电销管理人数据列表")
+    @GetMapping(value = "/findDxUserList")
+    public HttpResult findDxUserList() {
+        return HttpResult.ok(sysUserService.findDxUserList());
+    }
+
 }

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

@@ -467,6 +467,14 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
 
     List<SysUser> getAllAgent(String pid ,  List<String>  ids);
 
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2024/9/24 17:35
+     *  @Description:  查询电销的管理人列表
+     */
+    List<SysUser> findDxUserList();
+
 }
 
 

src/main/java/com/ydtech/modules/admin/model/SysUser.java

@@ -217,6 +217,14 @@ public class SysUser extends BaseEntity {
     @TableField(exist = false)
     private List<SysUser> children;
 
+    @TableField(value = "manager_id")
+    @ApiModelProperty("电销管理人")
+    private String managerId;
+
+    @TableField(value = "manager_name")
+    @ApiModelProperty("电销管理人名称")
+    private String managerName;
+
     /**
      * 验证用户
      *

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

@@ -255,6 +255,14 @@ public interface SysUserService extends BaseIService<SysUser> {
      * @return
      */
     List<SysUser> findNextAgentTree(String pid);
+
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2024/9/24 17:35
+     *  @Description:  查询电销的管理人列表
+     */
+    List<SysUser> findDxUserList();
 }
 
 

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

@@ -1684,5 +1684,14 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         return HttpResult.ok();
 
     }
-
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2024/9/24 17:36
+     *  @Description: 电销管理人数据
+     */
+    @Override
+    public List<SysUser> findDxUserList() {
+        return  sysUserMapper.findDxUserList();
+    }
 }

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

@@ -1570,5 +1570,24 @@
         </foreach>
     </update>
 
-
+    <select id="findDxUserList" resultType="com.ydtech.modules.admin.model.SysUser">
+        SELECT
+            t1.id AS id,
+            t1.NAME AS NAME
+        FROM
+            sys_user t1
+        WHERE
+            t1.`status` = 1
+          AND t1.id NOT LIKE '%M%' UNION
+        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>