修改查询信息

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

@@ -2,9 +2,8 @@ package com.ydtech.modules.admin.controller;
 
 
 import com.ydtech.core.page.HttpResult;
-import com.ydtech.modules.admin.model.SysUser;
+import com.ydtech.modules.admin.model.dto.SysUserTeamDto;
 import com.ydtech.modules.admin.model.vo.AppCustomerManagementQueryVo;
-import com.ydtech.modules.admin.model.vo.SysAreaVo;
 import com.ydtech.modules.admin.service.AppCustomerManagementService;
 import com.ydtech.modules.order.entity.BasePageResult;
 import io.swagger.annotations.Api;
@@ -15,8 +14,6 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.List;
-
 @Api(tags = "app客户管理功能")
 @RestController
 @RequestMapping("/app/customer")
@@ -25,10 +22,9 @@ public class AppCustomerManagementController {
 
     private final AppCustomerManagementService appCustomerManagementService;
 
-
     @ApiOperation(value = "认证查询")
     @PostMapping(value = "/authenticationQuery")
-    public HttpResult<BasePageResult<SysUser>> authenticationQuery(@RequestBody AppCustomerManagementQueryVo appCustomerManagementQueryVo) {
+    public HttpResult<BasePageResult<SysUserTeamDto>> authenticationQuery(@RequestBody AppCustomerManagementQueryVo appCustomerManagementQueryVo) {
         return appCustomerManagementService.authenticationQuery(appCustomerManagementQueryVo);
     }
 

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

@@ -0,0 +1,35 @@
+package com.ydtech.modules.admin.model.dto;
+
+import com.ydtech.modules.admin.model.SysUser;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+@ApiModel(value = "团队认证返回实体")
+@Data
+public class SysUserTeamDto implements Serializable {
+
+    private static final long serialVersionUID = 8942812169841900706L;
+
+    @ApiModelProperty(value = "用户ID")
+    private String id;
+
+    @ApiModelProperty(value = "姓名")
+    private String name;
+
+    @ApiModelProperty(value = "手机号")
+    private String mobile;
+
+    @ApiModelProperty(value = "状态")
+    private Integer status;
+
+    public SysUserTeamDto(SysUser sysUser) {
+        this.id = sysUser.getId();
+        this.name = sysUser.getName();
+        this.mobile = sysUser.getMobile();
+        this.status = sysUser.getStatus();
+    }
+}

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

@@ -1,13 +1,10 @@
 package com.ydtech.modules.admin.service;
 
 import com.ydtech.core.page.HttpResult;
-import com.ydtech.modules.admin.model.SysUser;
+import com.ydtech.modules.admin.model.dto.SysUserTeamDto;
 import com.ydtech.modules.admin.model.vo.AppCustomerManagementQueryVo;
-import com.ydtech.modules.admin.model.vo.SysAreaVo;
 import com.ydtech.modules.order.entity.BasePageResult;
 
-import java.util.List;
-
 public interface AppCustomerManagementService {
 
 
@@ -15,8 +12,10 @@ public interface AppCustomerManagementService {
      * @description: app客户查询实体
      * @author: wenks
      * @date: 2024/6/3 18:40
-     * @param:
-     * @return:
+     * @param: AppCustomerManagementQueryVo 客户管理查询实体
+     * @return: 用户返回信息
      **/
-    HttpResult<BasePageResult<SysUser>> authenticationQuery(AppCustomerManagementQueryVo appCustomerManagementQueryVo);
+    HttpResult<BasePageResult<SysUserTeamDto>> authenticationQuery(AppCustomerManagementQueryVo appCustomerManagementQueryVo);
+
+
 }

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

@@ -6,6 +6,7 @@ import com.ydtech.constants.enums.dict.organization.OrganizationSource;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.modules.admin.model.SysDept;
 import com.ydtech.modules.admin.model.SysUser;
+import com.ydtech.modules.admin.model.dto.SysUserTeamDto;
 import com.ydtech.modules.admin.model.vo.AppCustomerManagementQueryVo;
 import com.ydtech.modules.admin.service.AppCustomerManagementService;
 import com.ydtech.modules.admin.service.SysDeptService;
@@ -13,12 +14,12 @@ import com.ydtech.modules.admin.service.SysUserService;
 import com.ydtech.modules.base.controller.BaseController;
 import com.ydtech.modules.esm.service.EsmUserReferrerService;
 import com.ydtech.modules.order.entity.BasePageResult;
-import com.ydtech.modules.order.entity.InsOrders;
 import com.ydtech.utils.StringUtils;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
 @Service
 @RequiredArgsConstructor
@@ -26,12 +27,13 @@ public class AppCustomerManagementImpl implements AppCustomerManagementService {
 
     private final SysUserService sysUserService;
 
+    private final SysDeptService sysDeptService;
+
     private final EsmUserReferrerService esmUserReferrerService;
 
-    private final SysDeptService sysDeptService;
 
     @Override
-    public HttpResult< BasePageResult<SysUser>> authenticationQuery(AppCustomerManagementQueryVo managementQueryVo) {
+    public HttpResult<BasePageResult<SysUserTeamDto>> authenticationQuery(AppCustomerManagementQueryVo managementQueryVo) {
         String deptId = new BaseController().getDeptId();
         SysDept dept = sysDeptService.getById(deptId);
         Page<SysUser> page = new Page<>(managementQueryVo.getPageNum(), managementQueryVo.getPageSize());
@@ -45,16 +47,16 @@ public class AppCustomerManagementImpl implements AppCustomerManagementService {
                     .eq(StringUtils.isEmpty(managementQueryVo.getUsername()), SysUser::getName, managementQueryVo.getUsername())
                     .page(page);
 
-            BasePageResult<SysUser> sysUserBasePageResult = new BasePageResult<>(managementQueryVo.getPageNum(), managementQueryVo.getPageSize(), sysUserPage.getTotal(),
+            List<SysUserTeamDto> sysUserTeamDtos = sysUserPage.getRecords().stream().map(SysUserTeamDto::new).collect(Collectors.toList());
+            BasePageResult<SysUserTeamDto> sysUserBasePageResult = new BasePageResult<>(managementQueryVo.getPageNum(), managementQueryVo.getPageSize(), sysUserPage.getTotal(),
                     sysUserPage.getPages()
-                    , sysUserPage.getRecords());
+                    , sysUserTeamDtos);
 
             return HttpResult.ok(sysUserBasePageResult);
         }
 
-        BasePageResult<SysUser> sysUserBasePageResult = esmUserReferrerService.getTeamUser(managementQueryVo, userId);
+        BasePageResult<SysUserTeamDto> sysUserBasePageResult = esmUserReferrerService.getTeamUser(managementQueryVo, userId);
         return HttpResult.ok(sysUserBasePageResult);
     }
 
-
 }

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

@@ -4,6 +4,7 @@ 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.dto.SysUserDto;
+import com.ydtech.modules.admin.model.dto.SysUserTeamDto;
 import com.ydtech.modules.admin.model.vo.SysReferrerVo;
 import com.ydtech.modules.admin.model.vo.SysUserBaseVO;
 import com.ydtech.modules.admin.model.vo.SysUserVO;
@@ -195,7 +196,7 @@ public interface EsmUserReferrerMapper extends BaseMapper<EsmUserReferrer> {
     Page<QueryChannel> getQueryChannelPage(Page page, QueryChannel queryChannel);
 
 
-    List<SysUser> getByTeam(@Param("userId") String userId, @Param("level") int level);
+    List<SysUserTeamDto> getByTeam(@Param("userId") String userId, @Param("level") int level);
 
 
 

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

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.modules.admin.model.SysUser;
 import com.ydtech.modules.admin.model.dto.SysUserDto;
+import com.ydtech.modules.admin.model.dto.SysUserTeamDto;
 import com.ydtech.modules.admin.model.vo.AppCustomerManagementQueryVo;
 import com.ydtech.modules.admin.model.vo.SysReferrerVo;
 import com.ydtech.modules.base.model.dto.PageDto;
@@ -74,7 +75,7 @@ public interface EsmUserReferrerService extends IService<EsmUserReferrer> {
      * @param:
      * @return:
      **/
-    BasePageResult<SysUser> getTeamUser(AppCustomerManagementQueryVo managementQueryVo, String userId);
+    BasePageResult<SysUserTeamDto> getTeamUser(AppCustomerManagementQueryVo managementQueryVo, String userId);
 
 
 }

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

@@ -9,6 +9,7 @@ import com.ydtech.core.page.PageResult;
 import com.ydtech.exception.SystemException;
 import com.ydtech.modules.admin.model.SysUser;
 import com.ydtech.modules.admin.model.dto.SysUserDto;
+import com.ydtech.modules.admin.model.dto.SysUserTeamDto;
 import com.ydtech.modules.admin.model.vo.AppCustomerManagementQueryVo;
 import com.ydtech.modules.admin.model.vo.SysReferrerVo;
 import com.ydtech.modules.admin.service.SysUserService;
@@ -439,15 +440,15 @@ public class EsmUserReferrerServiceImpl extends ServiceImpl<EsmUserReferrerMappe
 
 
     @Override
-    public BasePageResult<SysUser> getTeamUser(AppCustomerManagementQueryVo managementQueryVo, String userId) {
+    public BasePageResult<SysUserTeamDto> getTeamUser(AppCustomerManagementQueryVo managementQueryVo, String userId) {
         List<EsmUserReferrer> esmUserReferrers = lambdaQuery().eq(EsmUserReferrer::getReferrerId, userId).list();
         if (esmUserReferrers.isEmpty()) {
             return new BasePageResult<>();
         }
         int i = esmUserReferrers.get(0).getLevel() + 3;
         PageHelper.startPage(managementQueryVo.getPageNum(), managementQueryVo.getPageSize());
-        List<SysUser> byTeam = baseMapper.getByTeam(userId, i);
-        PageResult<SysUser> sysUserPageResult = new PageResult<>(byTeam);
+        List<SysUserTeamDto> byTeam = baseMapper.getByTeam(userId, i);
+        PageResult<SysUserTeamDto> sysUserPageResult = new PageResult<>(byTeam);
         return new BasePageResult<>(managementQueryVo.getPageNum(), managementQueryVo.getPageSize(), sysUserPageResult.getTotalPages(),
                 sysUserPageResult.getPageSize(), sysUserPageResult.getContent());
     }

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

@@ -51,7 +51,7 @@
             sd.id
     </select>
 
-    <select id="getByTeam" resultMap="SysUserMap">
+    <select id="getByTeam" resultType="com.ydtech.modules.admin.model.dto.SysUserTeamDto">
         with recursive t1 as (select *
                               from esm_user_referrer
                               WHERE referrer_id = #{userId}
@@ -60,7 +60,7 @@
                               from esm_user_referrer r1
                                        INNER JOIN t1 on t1.id = r1.referrer_id
                               WHERE r1.level &lt; #{level})
-        select u.*
+        select u.id, u.name, u.mobile, u.status
         from t1
                  LEFT JOIN sys_user u on t1.id = u.id
     </select>