From 9cadbc8e5ee7904866cf3effc56a8f77592b3758 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Tue, 26 Jul 2022 09:43:09 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E8=B0=83=E6=95=B4=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/service/impl/DataReportingServiceImpl.java  | 3 +++
 .../src/main/resources/mapper/org/CustomerGridDao.xml          | 2 +-
 .../opendata/service/impl/GridstaffInfoPingyinServiceImpl.java | 3 +++
 3 files changed, 7 insertions(+), 1 deletion(-)

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 bf042e7c91..a7cceb6fa2 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
@@ -100,6 +100,9 @@ public class DataReportingServiceImpl implements DataReportingService {
 	public List<GridUserInfoDTO> getStaffBaseInfo(StaffBaseInfoFormDTO formDTO) {
 		//1.查询工作人员所属网格信息
 		List<GridUserInfoDTO> resultList = customerGridService.getStaffGrid(formDTO);
+		if (CollectionUtils.isEmpty(resultList)) {
+			return new ArrayList<>();
+		}
 
 		//2.查询工作人员基础信息
 		List<CustomerStaffDTO> staffDTOList = userService.getStaffBaseInfo(formDTO);
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/CustomerGridDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/CustomerGridDao.xml
index edab6411d7..061b1e43bf 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/CustomerGridDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/CustomerGridDao.xml
@@ -181,7 +181,7 @@
             cg.`code` code
         FROM
             customer_staff_grid csg
-        INNER JOIN customer_grid cg ON csg.grid_id = cg.id
+        INNER JOIN customer_grid cg ON csg.grid_id = cg.id AND cg.`CODE` != '' AND cg.`CODE` is not null
         WHERE
             csg.del_flag = '0'
         AND csg.customer_id = #{customerId}
diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GridstaffInfoPingyinServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GridstaffInfoPingyinServiceImpl.java
index 95a48de722..060a9ec449 100755
--- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GridstaffInfoPingyinServiceImpl.java
+++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GridstaffInfoPingyinServiceImpl.java
@@ -111,6 +111,9 @@ public class GridstaffInfoPingyinServiceImpl extends BaseServiceImpl<GridstaffIn
         if (!result.success()) {
             throw new RenException(result.getInternalMsg());
         }
+        if (CollectionUtils.isEmpty(result.getData())) {
+            return;
+        }
 
         //2.中间库新增/修改数据【基本一个人一条数据，程序按批量处理】
         result.getData().forEach(r -> {