From f68a403ef26b9608447cfc14e7dd956c5b1325c6 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 23 Jul 2021 15:30:25 +0800
Subject: [PATCH 1/3] /epmet/ext/staff/permissionv2

---
 .../src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml
index 6f83783845..0d940865f0 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml
@@ -241,6 +241,7 @@
         WHERE
             agency.DEL_FLAG = '0'
             AND agency.AREA_CODE like concat(#{areaCode},'%')
+            AND LENGTH(agency.PARENT_AREA_CODE) &gt; 0
     </select>
 
     <!--   查找组织下的部门  -->

From 941d0388370d0c06a9ce400601c514eda36db2a9 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Fri, 23 Jul 2021 15:33:24 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/service/impl/GridLatestServiceImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridLatestServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridLatestServiceImpl.java
index a5501439cc..63a26443d9 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridLatestServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridLatestServiceImpl.java
@@ -193,7 +193,7 @@ public class GridLatestServiceImpl extends BaseServiceImpl<GridLatestDao, GridLa
     public List<CustomerUser4PointResultDTO> getCustomerUsers(CustomerUserFormDTO customerUserFormDTO) {
         PageHelper.startPage(customerUserFormDTO.getPageNo(),customerUserFormDTO.getPageSize());
         List<CustomerUser4PointResultDTO> allData = userWechatDao.selectResiAndStrangerInfo(customerUserFormDTO.getCustomerId(),customerUserFormDTO.getName());
-        if (!CollectionUtils.isEmpty(allData)){
+        if (CollectionUtils.isEmpty(allData)){
             return new ArrayList<>();
         }
         allData.forEach(info -> {

From 53b0d9e40f1c2ce0dbda851ef0a4bd97a7106cff Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 23 Jul 2021 15:33:33 +0800
Subject: [PATCH 3/3] /epmet/ext/staff/permissionv2

---
 .../datareport/dao/plugins/ScreenWorkRecordOrgDailyDao.java   | 1 -
 .../plugins/impl/ScreenWorkRecordOrgDailyServiceImpl.java     | 4 +++-
 .../resources/mapper/plugins/ScreenWorkRecordOrgDailyDao.xml  | 2 --
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/plugins/ScreenWorkRecordOrgDailyDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/plugins/ScreenWorkRecordOrgDailyDao.java
index f423d64f9c..3f323c0dd5 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/plugins/ScreenWorkRecordOrgDailyDao.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/plugins/ScreenWorkRecordOrgDailyDao.java
@@ -63,7 +63,6 @@ public interface ScreenWorkRecordOrgDailyDao extends BaseDao<ScreenWorkRecordOrg
 
 
     WorkRecordSubRank selectUpToCalAgency(@Param("agencyId")String agencyId,
-                                          @Param("agencyName")String agencyName,
                                           @Param("dateId")String dateId,
                                           @Param("typeCodeList") List<String> typeCodeList);
 
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/plugins/impl/ScreenWorkRecordOrgDailyServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/plugins/impl/ScreenWorkRecordOrgDailyServiceImpl.java
index 0f4086f0ce..e779bf4cac 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/plugins/impl/ScreenWorkRecordOrgDailyServiceImpl.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/plugins/impl/ScreenWorkRecordOrgDailyServiceImpl.java
@@ -116,8 +116,10 @@ public class ScreenWorkRecordOrgDailyServiceImpl extends BaseServiceImpl<ScreenW
         //2）、下级所有组织
         List<WorkRecordSubRank> subAgencyRankList = new ArrayList<>();
         for(ScreenCustomerAgencyCommonDTO agencyCommonDTO:agencyInfoDTO.getSubAgencies()){
-            WorkRecordSubRank agencyRes= baseDao.selectUpToCalAgency(agencyCommonDTO.getAgencyId(),agencyCommonDTO.getAgencyName(),dateId,typeCodeList);
+            WorkRecordSubRank agencyRes= baseDao.selectUpToCalAgency(agencyCommonDTO.getAgencyId(),dateId,typeCodeList);
             if(null !=agencyRes){
+                agencyRes.setOrgId(agencyCommonDTO.getAgencyId());
+                agencyRes.setName(agencyCommonDTO.getAgencyName());
                 agencyRes.setIsDefault("no");
                 subAgencyRankList.add(agencyRes);
             }else{
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/plugins/ScreenWorkRecordOrgDailyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/plugins/ScreenWorkRecordOrgDailyDao.xml
index f7ef36517f..4142b53239 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/plugins/ScreenWorkRecordOrgDailyDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/plugins/ScreenWorkRecordOrgDailyDao.xml
@@ -109,8 +109,6 @@
 
     <select id="selectUpToCalAgency" parameterType="map" resultType="com.epmet.plugins.result.WorkRecordSubRank">
         SELECT
-            #{agencyId} as orgId
-            #{agencyName} AS `NAME`,
             sum( m.PARTICIPATE_USER_TOTAL ) AS participateUserTotal,
             sum( m.ORGANIZE_TOTAL ) AS participateTotal
         FROM