Merge branch 'develop' into release_temp

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 {}
 
 }

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<List<StaffListResultDTO>>().ok(epmetUserService.staffPatrolList(formDTO));
     }

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<CustomerStaffEntity> {
      * @Description 按staffId查询基础信息
      * @author sun
      */
-    List<CustomerStaffDTO> selectByStaffIds(@Param("staffIds") List<String> staffIds, @Param("realName") String realName);
+    List<CustomerStaffDTO> selectByStaffIds(@Param("customerId") String customerId, @Param("staffIds") List<String> staffIds, @Param("realName") String realName);
 
     /**
      * @Description 模糊查询用户、角色信息

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java

@@ -299,7 +299,7 @@ public class EpmetUserServiceImpl implements EpmetUserService {
         List<CustomerStaffDTO> 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 {
@@ -311,7 +311,7 @@ public class EpmetUserServiceImpl implements EpmetUserService {
         //2-3.查询人员基本信息【之前sql关联人员表查性别、姓名效率低 所以分开查）
         if (CollectionUtils.isEmpty(staffList)) {
             List<String> staffIdList = resultList.stream().map(StaffListResultDTO::getStaffId).collect(Collectors.toList());
-            staffList = customerStaffDao.selectByStaffIds(staffIdList, null);
+            staffList = customerStaffDao.selectByStaffIds(formDTO.getCustomerId(), staffIdList, null);
         }
 
         //3.封装数据并返回

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}
         <if test="realName != null and realName != '' ">
             AND real_name = #{realName}
         </if>