From 2e645b3cf91325ccc13006483087eaae3d1d5bc2 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Fri, 27 Aug 2021 16:09:50 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A0=E5=8F=AF=E5=A5=88=E4=BD=95=E8=8A=B1?= =?UTF-8?q?=E8=90=BD=E5=8E=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dataaggre/dto/epmetuser/form/StaffListFormDTO.java | 2 ++ .../com/epmet/dataaggre/controller/EpmetUserController.java | 1 + .../com/epmet/dataaggre/dao/epmetuser/CustomerStaffDao.java | 2 +- .../service/epmetuser/impl/EpmetUserServiceImpl.java | 4 ++-- .../src/main/resources/mapper/epmetuser/CustomerStaffDao.xml | 3 ++- 5 files changed, 8 insertions(+), 4 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/form/StaffListFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/form/StaffListFormDTO.java index 6be616d569..ea545fb8a3 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/form/StaffListFormDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/form/StaffListFormDTO.java @@ -53,6 +53,8 @@ public class StaffListFormDTO implements Serializable { private String userId; //起止巡查开始时间 private String patrolStartTime; + //token中客户Id + private String customerId; public interface Staff extends CustomerClientShowGroup {} } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetUserController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetUserController.java index 3c20f3dad8..25cbe6a146 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetUserController.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetUserController.java @@ -100,6 +100,7 @@ public class EpmetUserController { /*if (formDTO.getTime() != 1 && formDTO.getTime() != 3) { throw new RenException("参数错误，最近时间值不正确"); }*/ + formDTO.setCustomerId(tokenDto.getCustomerId()); formDTO.setUserId(tokenDto.getUserId()); return new Result>().ok(epmetUserService.staffPatrolList(formDTO)); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/CustomerStaffDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/CustomerStaffDao.java index 5fef749e49..a046a17f9c 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/CustomerStaffDao.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/CustomerStaffDao.java @@ -46,7 +46,7 @@ public interface CustomerStaffDao extends BaseDao { * @Description 按staffId查询基础信息 * @author sun */ - List selectByStaffIds(@Param("staffIds") List staffIds, @Param("realName") String realName); + List selectByStaffIds(@Param("customerId") String customerId, @Param("staffIds") List staffIds, @Param("realName") String realName); /** * @Description 模糊查询用户、角色信息 diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java index ab72a11410..0f3c738d8f 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java @@ -296,7 +296,7 @@ public class EpmetUserServiceImpl implements EpmetUserService { List staffList = new ArrayList<>(); //2-1.按名字检索时先查询人员基础信息 if (!StringUtils.isEmpty(formDTO.getStaffName())) { - staffList = customerStaffDao.selectByStaffIds(null, formDTO.getStaffName()); + staffList = customerStaffDao.selectByStaffIds(formDTO.getCustomerId(), null, formDTO.getStaffName()); if (!CollectionUtils.isEmpty(staffList)) { formDTO.setStaffId(staffList.get(0).getUserId()); }else { @@ -308,7 +308,7 @@ public class EpmetUserServiceImpl implements EpmetUserService { //2-3.查询人员基本信息【之前sql关联人员表查性别、姓名效率低 所以分开查） if (CollectionUtils.isEmpty(staffList)) { List staffIdList = resultList.stream().map(StaffListResultDTO::getStaffId).collect(Collectors.toList()); - staffList = customerStaffDao.selectByStaffIds(staffIdList, null); + staffList = customerStaffDao.selectByStaffIds(formDTO.getCustomerId(), staffIdList, null); } //3.封装数据并返回 diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/CustomerStaffDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/CustomerStaffDao.xml index b57e89ac99..9b5da74efb 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/CustomerStaffDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/CustomerStaffDao.xml @@ -20,7 +20,8 @@ * FROM customer_staff - WHERE 1=1 + WHERE del_flag = '0' + AND customer_id = #{customerId} AND real_name = #{realName}