From b039cfae11b3162967352b5a347db42f99ff1a20 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Thu, 14 Oct 2021 14:02:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../feign/DataStatisticalOpenFeignClient.java    |  4 ++--
 .../controller/DataReportingController.java      |  2 +-
 .../main/java/com/epmet/dao/user/UserDao.java    |  2 +-
 .../com/epmet/service/DataReportingService.java  |  2 +-
 .../service/impl/DataReportingServiceImpl.java   |  4 ++--
 .../java/com/epmet/service/user/UserService.java |  2 +-
 .../epmet/service/user/impl/UserServiceImpl.java |  2 +-
 .../src/main/resources/mapper/user/UserDao.xml   | 16 +++++++++++-----
 8 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/DataStatisticalOpenFeignClient.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/DataStatisticalOpenFeignClient.java
index e4a7e94dd6..c74dcff61c 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/DataStatisticalOpenFeignClient.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/DataStatisticalOpenFeignClient.java
@@ -293,14 +293,14 @@ public interface DataStatisticalOpenFeignClient {
     Result<List<CustomerAgencyDTO>> getAgencyBaseInfo(@RequestBody AgencyBaseInfoFormDTO formDTO);
 
     /**
-     * @dscription 批量查询客户组织基础信息
+     * @dscription 批量查询客户网格基础信息
      * @author sun
      */
     @PostMapping("/data/stats/datareporting/gridbaseinfo")
     Result<List<CustomerGridDTO>> getGridBaseInfo(@RequestBody GridBaseInfoFormDTO formDTO);
 
     /**
-     * @dscription 批量查询客户组织基础信息
+     * @dscription 批量查询客户网格员基础信息
      * @author sun
      */
     @PostMapping("/data/stats/datareporting/staffbaseinfo")
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DataReportingController.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DataReportingController.java
index 129c44d2aa..5775a22a2a 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DataReportingController.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DataReportingController.java
@@ -49,7 +49,7 @@ public class DataReportingController {
 
 	/**
 	 * @Author sun
-	 * @Description 批量查询客户网格人员基础信息
+	 * @Description 批量查询客户网格员基础信息
 	 **/
 	@PostMapping("staffbaseinfo")
 	public Result<List<CustomerStaffDTO>> getStaffBaseInfo(@RequestBody(required = false) StaffBaseInfoFormDTO formDTO) {
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/user/UserDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/user/UserDao.java
index 8501780460..dac88a5fbf 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/user/UserDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/user/UserDao.java
@@ -256,7 +256,7 @@ public interface UserDao {
 
     /**
      * @Author sun
-     * @Description 批量查询客户网格人员基础信息
+     * @Description 批量查询客户网格员基础信息
      **/
     List<CustomerStaffDTO> getStaffBaseInfo(StaffBaseInfoFormDTO formDTO);
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/DataReportingService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/DataReportingService.java
index 779b430eeb..5d0c7538c5 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/DataReportingService.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/DataReportingService.java
@@ -30,7 +30,7 @@ public interface DataReportingService {
 
 	/**
 	 * @Author sun
-	 * @Description 批量查询客户网格人员基础信息
+	 * @Description 批量查询客户网格员基础信息
 	 *
 	 * @return*/
 	List<CustomerStaffDTO> getStaffBaseInfo(StaffBaseInfoFormDTO formDTO);
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/DataReportingServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/DataReportingServiceImpl.java
index 5e626d3304..211c4b5a7b 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/DataReportingServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/DataReportingServiceImpl.java
@@ -54,11 +54,11 @@ public class DataReportingServiceImpl implements DataReportingService {
 
 	/**
 	 * @Author sun
-	 * @Description 批量查询客户网格人员基础信息
+	 * @Description 批量查询客户网格员基础信息
 	 **/
 	@Override
 	public List<CustomerStaffDTO> getStaffBaseInfo(StaffBaseInfoFormDTO formDTO) {
-		//批量查询客户网格人员信息
+		//批量查询客户网格员信息
 		List<CustomerStaffDTO> resultList = userService.getStaffBaseInfo(formDTO);
 		return resultList;
 	}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/user/UserService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/user/UserService.java
index ba909341dc..cc75f43258 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/user/UserService.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/user/UserService.java
@@ -141,7 +141,7 @@ public interface UserService {
 
     /**
      * @Author sun
-     * @Description 批量查询客户网格人员基础信息
+     * @Description 批量查询客户网格员基础信息
      **/
     List<CustomerStaffDTO> getStaffBaseInfo(StaffBaseInfoFormDTO formDTO);
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/user/impl/UserServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/user/impl/UserServiceImpl.java
index f6df5e128c..2c5e72333f 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/user/impl/UserServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/user/impl/UserServiceImpl.java
@@ -1091,7 +1091,7 @@ public class UserServiceImpl implements UserService {
 
     /**
      * @Author sun
-     * @Description 批量查询客户网格人员基础信息
+     * @Description 批量查询客户网格员基础信息
      **/
     @Override
     public List<CustomerStaffDTO> getStaffBaseInfo(StaffBaseInfoFormDTO formDTO) {
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/user/UserDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/user/UserDao.xml
index 16e58d07fc..f71bb10cca 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/user/UserDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/user/UserDao.xml
@@ -993,13 +993,19 @@
 
     <select id="getStaffBaseInfo" resultType="com.epmet.dto.user.result.CustomerStaffDTO">
         SELECT
-        *
+            cs.*
         FROM
-            customer_staff
+            customer_staff cs
+        INNER JOIN staff_role sr ON cs.user_id = sr.staff_id
+        INNER JOIN gov_staff_role gsr ON sr.role_id = gsr.id
         WHERE
-            del_flag = '0'
-        AND customer_id = #{customerId}
-        <foreach collection="staffIdList" item="staffId" open="AND user_id IN (" separator="," close=")">
+            cs.del_flag = '0'
+        AND cs.enable_flag = 'enable'
+        AND sr.del_flag = '0'
+        AND gsr.del_flag = '0'
+        AND gsr.role_name = '网格员'
+        AND cs.customer_id = #{customerId}
+        <foreach collection="staffIdList" item="staffId" open="AND cs.USER_ID IN (" separator="," close=")">
             #{staffId}
         </foreach>
     </select>