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

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

@@ -409,12 +409,21 @@ public class SysUserController extends BaseController {
 
     @ApiOperation(value = "后线用户查询分页")
     @PostMapping(value = "/findBackUserList")
-    public HttpResult findBackUserList(@RequestBody PageDto<SysUserDto> pageDto) {
-        if (pageDto.getDto().getDeptId() == null) {
+    public HttpResult findBackUserList(@RequestBody SysUserDto sysUserDto) {
+        if (sysUserDto.getDeptId() == null) {
             BaseController baseController = new BaseController();
-            pageDto.getDto().setDeptId(baseController.getDeptId());
+            sysUserDto.setDeptId(baseController.getDeptId());
+        }
+        return HttpResult.ok(sysUserService.findBackUserList(sysUserDto));
+    }
+    @ApiOperation(value = "后线用户查询不分页（编辑时查询领导人）")
+    @PostMapping(value = "/findBackUserList1")
+    public HttpResult findBackUserList1(@RequestBody SysUserDto sysUserDto) {
+        if (sysUserDto.getDeptId() == null) {
+            BaseController baseController = new BaseController();
+            sysUserDto.setDeptId(baseController.getDeptId());
         }
-        return HttpResult.ok(sysUserService.findBackUserList(pageDto));
+        return HttpResult.ok(sysUserService.findBackUserList1(sysUserDto));
     }
 
     @ApiOperation(value = "渠道数据统计")

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

@@ -136,6 +136,8 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
 
     IPage<SysUserBaseVO> findBackUserList(@Param("page") Page page, @Param("user") SysUserDto user);
 
+    List<SysUserBaseVO> findBackUserList1(@Param("user") SysUserDto user);
+
     /**
      * 获取用户列表
      * @param page 分页信息

src/main/java/com/ydtech/modules/admin/model/dto/SysUserDto.java

@@ -39,4 +39,8 @@ public class SysUserDto extends PageRequest {
 
     @ApiModelProperty("代理个代标识")
     private Integer agentFlag;
+
+    private int pageNum;
+
+    private int pageSize;
 }

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

@@ -83,7 +83,9 @@ public interface SysUserService extends IService<SysUser> {
 
     IPage<SysUserBaseVO> findAllUserList(PageDto<SysUserDto> pageDto);
 
-    IPage<SysUserBaseVO> findBackUserList(PageDto<SysUserDto> pageDto);
+    IPage<SysUserBaseVO> findBackUserList(SysUserDto sysUserDto);
+
+    List<SysUserBaseVO> findBackUserList1(SysUserDto sysUserDto);
 
     IPage<QuTeamNum> quTeamNum(QuTeamNumDto quTeamNumDto);
 

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

@@ -106,17 +106,23 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     }
 
     @Override
-    public IPage<SysUserBaseVO> findBackUserList(PageDto<SysUserDto> pageDto) {
+    public IPage<SysUserBaseVO> findBackUserList(SysUserDto sysUserDto) {
         PageVo<SysUserBaseVO> pageVo = new PageVo();
-        Page page = new Page(pageDto.getPageNum(), pageDto.getPageSize());
-        pageVo.setPageNum(pageDto.getPageNum());
-        pageVo.setPageSize(pageDto.getPageSize());
+        Page page = new Page(sysUserDto.getPageNum(), sysUserDto.getPageSize());
+        pageVo.setPageNum(sysUserDto.getPageNum());
+        pageVo.setPageSize(sysUserDto.getPageSize());
+        if (sysUserDto.getAgentFlag() == null) {
+            throw new SystemException("必传标识未传递");
+        }
+        return sysUserMapper.findBackUserList(page, sysUserDto);
+    }
 
-        SysUserDto sysUserVO = JSONObject.parseObject(JSONObject.toJSONString(pageDto.getDto()), SysUserDto.class);
-        if (sysUserVO.getAgentFlag() == null) {
+    @Override
+    public List<SysUserBaseVO> findBackUserList1(SysUserDto sysUserDto) {
+        if (sysUserDto.getAgentFlag() == null) {
             throw new SystemException("必传标识未传递");
         }
-        return sysUserMapper.findBackUserList(page, sysUserVO);
+        return sysUserMapper.findBackUserList1(sysUserDto);
     }
 
 

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

@@ -278,6 +278,58 @@
         </if>
     </select>
 
+    <select id="findBackUserList1" resultType="com.ydtech.modules.admin.model.vo.SysUserBaseVO">
+        SELECT
+        su.id as userId,
+        su.name,
+        su.position_name,
+        info.sex,
+        su.mobile,
+        su.status,
+        sd.id as deptId,
+        sd.name as deptName,
+        t4.id as roleId,
+        t4.name as roleName,
+        sd.management_source,
+        psd.id as pDeptId,
+        psd.name as pDeptName
+        FROM
+        sys_user su
+        LEFT JOIN sys_user_info info ON info.id = su.id
+        LEFT JOIN sys_dept sd ON su.dept_id = sd.id
+        left join sys_dept psd on psd.id = sd.parent_id
+        LEFT JOIN sys_user_role t3 ON su.id = t3.user_id
+        LEFT JOIN sys_role t4 ON t3.role_id = t4.id
+        AND sd.del_flag = '0'
+        WHERE
+        1=1
+        and su.status = '1'
+        <if test='user !=null  '>
+            <if test='user.name !=null and user.name!="" '>
+                and su.name like concat('%',#{user.name},'%')
+            </if>
+            <if test='user.userId !=null and user.userId!="" '>
+                and su.id = #{user.userId}
+            </if>
+            <if test='user.mobile !=null and user.mobile!=""  '>
+                and su.mobile = #{user.mobile}
+            </if>
+            <if test='user.deptId !=null and user.deptId!=""  '>
+                and su.dept_id like concat('%',#{user.deptId},'%')
+            </if>
+            <if test='user.leaderName !=null and user.leaderName!=""  '>
+                and su.leader_name like concat('%',#{user.leaderName},'%')
+            </if>
+            <if test="user.agentFlag !=null and user.agentFlag != 0 ">
+                and sd.management_source = #{user.agentFlag}
+            </if>
+            <if test="user.agentFlag != null and user.agentFlag == 0">
+                and sd.management_source is null
+            </if>
+            and su.id NOT LIKE '%M%'
+        </if>
+    </select>
+
 
 
     <resultMap id="QuTeamNumMap" type="com.ydtech.modules.admin.model.QuTeamNum">