团队查询修改

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

@@ -1,5 +1,6 @@
 package com.ydtech.modules.admin.model.dto;
 
+import com.ydtech.core.page.PageRequest;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -12,7 +13,7 @@ import lombok.Data;
  */
 @Data
 @ApiModel
-public class SysUserDto {
+public class SysUserDto extends PageRequest {
 
 
     @ApiModelProperty("用户ID（工号）")

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

@@ -456,6 +456,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         if (StringUtils.isNotEmpty(sysUser.getReferrerId())) {
             //推荐人
             esmUserReferrerService.addReferrer(sysUser.getReferrerId(), userId);
+        }else if("20".equals(sysUser.getRoleId()) || "21".equals(sysUser.getRoleId())){
+            //如果是 团队长或代码人 并且没有推荐人 则默认推荐人为自己
+            esmUserReferrerService.addReferrer(sysUser.getId(), userId);
         }
 
 //        EsmUserReferrer eur = new EsmUserReferrer();

src/main/java/com/ydtech/modules/esm/controller/EsmUserController.java

@@ -4,7 +4,9 @@ package com.ydtech.modules.esm.controller;
 import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ydtech.core.page.HttpResult;
+import com.ydtech.core.page.PageRequest;
 import com.ydtech.modules.admin.model.SysDept;
 import com.ydtech.modules.admin.model.SysUser;
 import com.ydtech.modules.admin.model.SysUserRole;
@@ -64,74 +66,70 @@ public class EsmUserController extends BaseController {
         //添加团队长角色
         userRoleLqw.in(SysUserRole::getRoleId,20,21);
         userRoleLqw.eq(StringUtils.isNotEmpty(dto.getUserId()),SysUserRole::getUserId,dto.getUserId());
+
 //        List<SysUserRole> userRoleList = sysUserRoleService.list(userRoleLqw);
 
 //        List<String> strings = userRoleList.stream().map(x -> x.getUserId() + "").collect(Collectors.toList());
-
+        Page page = new Page(dto.getPageNum(), dto.getPageSize());
+        Page<SysUser> pageData = esmUserReferrerService.getUserPage(page);
         //用户ID 代理人角色
-        List<String> longs = sysUserRoleService.listObjs(userRoleLqw, Object::toString);
-
-        if(CollUtil.isNotEmpty(longs)){
-            //获取团队长
-            LambdaQueryWrapper<SysUser> lqwUser = new LambdaQueryWrapper<>();
-            lqwUser.in(SysUser::getId,longs);
-            lqwUser.eq(SysUser::getStatus,1);
-            lqwUser.ne(SysUser::getId,"admin");
-            lqwUser.eq(StringUtils.isNotEmpty(dto.getName()),SysUser::getName,dto.getName());
-            lqwUser.eq(StringUtils.isNotEmpty(dto.getMobile()),SysUser::getMobile,dto.getMobile());
-            List<SysUser> userList= sysUserService.list(lqwUser);
-
-
-            userList.forEach(a ->{
-
-                TeamUserVO vo = new TeamUserVO();
-                List<SysUser> oneList = new ArrayList<>();
-                List<SysUser> oneTempList = new ArrayList<>();
-
-                List<SysUser> twoList = new ArrayList<>();
-                List<SysUser> twoTempList = new ArrayList<>();
-
-                List<SysUser> threeList = new ArrayList<>();
-                List<SysUser> threeTempList = new ArrayList<>();
-
-                //一级
-                esmUserReferrerService.buildLevelList(a,oneList,oneTempList);
-
-                oneList.forEach(b ->{
-                    //二级
-                    esmUserReferrerService.buildLevelList(b,twoList,twoTempList);
-                    twoList.forEach(c ->{
-                        //三级
-                        esmUserReferrerService.buildLevelList(c,threeList,threeTempList);
-                    });
-
-                });
-
-                vo.setLevel1num(oneList.size());
-                vo.setLevel2num(twoList.size());
-                vo.setLevel3num(threeList.size());
-
-                //临时人数
-                vo.setTempnum(oneTempList.size() + twoTempList.size() + threeTempList.size());
-                //我的团队数
-                vo.setTeamnum(vo.getTempnum() + oneList.size() + twoList.size() + threeList.size());
-                vo.setId(a.getId());
-                vo.setName(a.getName());
-                vo.setMobile(a.getMobile());
-//            vo.setSex(a.getSex());
+        //Page<SysUserRole> pageData = sysUserRoleService.page(page, userRoleLqw);
+        List<String> longs = new ArrayList<>();
+        pageData.getRecords().forEach(x ->{
+            longs.add(x.getId());
+        });
+        List<SysUser> userList = new ArrayList<>();
+        userList = pageData.getRecords();
+        userList.forEach(a ->{
+
+            TeamUserVO vo = new TeamUserVO();
+            List<SysUser> oneList = new ArrayList<>();
+            List<SysUser> oneTempList = new ArrayList<>();
+
+            List<SysUser> twoList = new ArrayList<>();
+            List<SysUser> twoTempList = new ArrayList<>();
 
-                SysDept sysDept = sysDeptService.getById(a.getDeptId());
-                if(null != sysDept){
-                    vo.setDeptId(sysDept.getId());
-                    vo.setDeptName(sysDept.getName());
-                }
-                teamList.add(vo);
+            List<SysUser> threeList = new ArrayList<>();
+            List<SysUser> threeTempList = new ArrayList<>();
 
+            //一级
+            esmUserReferrerService.buildLevelList(a,oneList,oneTempList);
+
+            oneList.forEach(b ->{
+                //二级
+                esmUserReferrerService.buildLevelList(b,twoList,twoTempList);
 
             });
-        }
 
-        return HttpResult.ok(teamList);
+            vo.setLevel1num(oneList.size());
+            vo.setLevel2num(twoList.size());
+
+            //临时人数
+            vo.setTempnum(oneTempList.size() + twoTempList.size() );
+            //我的团队数
+            vo.setTeamnum(vo.getTempnum() + oneList.size() + twoList.size());
+            vo.setId(a.getId());
+            vo.setName(a.getName());
+            vo.setMobile(a.getMobile());
+//            vo.setSex(a.getSex());
+
+            SysDept sysDept = sysDeptService.getById(a.getDeptId());
+            if(null != sysDept){
+                vo.setDeptId(sysDept.getId());
+                vo.setDeptName(sysDept.getName());
+            }
+            teamList.add(vo);
+
+
+        });
+        pageData.setRecords(userList);
+        Page<TeamUserVO> resultData = new Page<TeamUserVO>();
+        resultData.setCurrent(pageData.getCurrent());
+        resultData.setSize(pageData.getSize());
+        resultData.setTotal(pageData.getTotal());
+        resultData.setPages(pageData.getPages());
+        resultData.setRecords(teamList);
+        return HttpResult.ok(resultData);
 
 
 

src/main/java/com/ydtech/modules/esm/dao/EsmUserReferrerMapper.java

@@ -1,6 +1,8 @@
 package com.ydtech.modules.esm.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ydtech.modules.admin.model.SysUser;
 import com.ydtech.modules.admin.model.vo.SysReferrerVo;
 import com.ydtech.modules.admin.model.vo.SysUserBaseVO;
 import com.ydtech.modules.admin.model.vo.SysUserVO;
@@ -185,4 +187,6 @@ public interface EsmUserReferrerMapper extends BaseMapper<EsmUserReferrer> {
             "</foreach > "
             , "</script>"})
     EsmTeamPolicyVO queryOrderCountHz(List<String> userList, String startDate, String endDate);
+
+    Page<SysUser> getUserPage(Page page);
 }

src/main/java/com/ydtech/modules/esm/service/EsmUserReferrerService.java

@@ -1,6 +1,7 @@
 package com.ydtech.modules.esm.service;
 
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.modules.admin.model.SysUser;
@@ -50,6 +51,8 @@ public interface EsmUserReferrerService extends IService<EsmUserReferrer> {
 
     public List<EsmUserReferrer> queryList(String affiliation);
     public List<String>  getUpUser(String userId,List<String> list);
+
+    public Page<SysUser> getUserPage(Page page);
 }
 
 

src/main/java/com/ydtech/modules/esm/service/impl/EsmUserReferrerServiceImpl.java

@@ -2,6 +2,7 @@ package com.ydtech.modules.esm.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.exception.SystemException;
@@ -49,6 +50,7 @@ public class EsmUserReferrerServiceImpl extends ServiceImpl<EsmUserReferrerMappe
 
         LambdaQueryWrapper<EsmUserReferrer> lqw = new LambdaQueryWrapper<>();
         lqw.eq(EsmUserReferrer::getReferrerId, agent.getId());
+        lqw.ne(EsmUserReferrer::getId, agent.getId());
         List<EsmUserReferrer> listAll = esmUserReferrerService.list(lqw);
 
         List<SysUser> oneList = new ArrayList<>();
@@ -76,7 +78,7 @@ public class EsmUserReferrerServiceImpl extends ServiceImpl<EsmUserReferrerMappe
     }
     @Override
     public void addReferrer(String referrerId, String nextPK) {
-        if(referrerId.equals(nextPK)) throw new SystemException("推荐人不能是自己");
+        //if(referrerId.equals(nextPK)) throw new SystemException("推荐人不能是自己");
         //推荐人信息
         EsmUserReferrer referrer = getById(referrerId);
         EsmUserReferrer eur = new EsmUserReferrer();
@@ -135,6 +137,11 @@ public class EsmUserReferrerServiceImpl extends ServiceImpl<EsmUserReferrerMappe
         return list;
     }
 
+    @Override
+    public Page<SysUser> getUserPage(Page page) {
+        return baseMapper.getUserPage(page);
+    }
+
     @Override
     public HttpResult<PageVo<SysReferrerVo>> gainReferrerPage(PageDto<SysReferrerVo> pageDto) {
 

src/main/resources/mapper/modules/esm/EsmUserReferrerMapper.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ydtech.modules.esm.dao.EsmUserReferrerMapper">
+
+    <resultMap id="SysUserMap" type="com.ydtech.modules.admin.model.SysUser">
+    </resultMap>
+    <select id="getUserPage" resultMap="SysUserMap">
+        SELECT
+            su.*
+        FROM
+            esm_user_referrer eur
+        LEFT JOIN sys_user su ON su.id = eur.id
+        WHERE
+            su.id != 'admin'
+          AND su.STATUS = 1
+          AND referrer_id IS NOT NULL
+    </select>
+</mapper>