From 0c808ae5aa03c6d17f13c414e69b3bb4ba6cbc9b Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 15 May 2020 10:47:04 +0800
Subject: [PATCH] =?UTF-8?q?getMyGrids=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=EF=BC=8Cresigroup=20=E7=BC=93=E5=AD=98=E5=BA=93db1,gateway?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 epmet-gateway/pom.xml                            |  4 ++++
 .../service/impl/StaffAgencyServiceImpl.java     | 16 ++++++++++++----
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/epmet-gateway/pom.xml b/epmet-gateway/pom.xml
index b96276ef8a..ee6408e6d3 100644
--- a/epmet-gateway/pom.xml
+++ b/epmet-gateway/pom.xml
@@ -130,14 +130,17 @@
                 <!--   12、居民端陌生人导览             -->
                 <gateway.routes.resi-guide-server.uri>lb://resi-guide-server</gateway.routes.resi-guide-server.uri>
                 <!--   13、政府组织管理            -->
+<!--                <gateway.routes.gov-org-server.uri>http://localhost:8092</gateway.routes.gov-org-server.uri>-->
                 <gateway.routes.gov-org-server.uri>lb://gov-org-server</gateway.routes.gov-org-server.uri>
                 <!--   14、#运营端访问权限控制   -->
                 <gateway.routes.oper-access-server.uri>lb://oper-access-server</gateway.routes.oper-access-server.uri>
                 <!--   15、居民端个人信息            -->
+<!--                <gateway.routes.resi-mine-server.uri>http://localhost:8094</gateway.routes.resi-mine-server.uri>-->
                 <gateway.routes.resi-mine-server.uri>lb://resi-mine-server</gateway.routes.resi-mine-server.uri>
                 <!--   16、居民端楼院校组             -->
                 <gateway.routes.resi-group-server.uri>lb://resi-group-server</gateway.routes.resi-group-server.uri>
                 <!--   17、党员认证、热心居民申请             -->
+<!--                <gateway.routes.resi-partymember-server.uri>http://localhost:8096</gateway.routes.resi-partymember-server.uri>-->
                 <gateway.routes.resi-partymember-server.uri>lb://resi-partymember-server</gateway.routes.resi-partymember-server.uri>
                 <!--   18、政府端网格管理             -->
                 <gateway.routes.gov-grid-server.uri>lb://gov-grid-server</gateway.routes.gov-grid-server.uri>
@@ -146,6 +149,7 @@
                 <gateway.routes.gov-access-server.uri>lb://gov-access-server</gateway.routes.gov-access-server.uri>
 
                 <!--20.政府端-我的-服务-->
+<!--                <gateway.routes.gov-mine-server.uri>http://localhost:8098</gateway.routes.gov-mine-server.uri>-->
                 <gateway.routes.gov-mine-server.uri>lb://gov-mine-server</gateway.routes.gov-mine-server.uri>
                 <!--  21、居民端党群e事              -->
                 <gateway.routes.resi-hall-server.uri>lb://resi-hall-server</gateway.routes.resi-hall-server.uri>
diff --git a/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/service/impl/StaffAgencyServiceImpl.java b/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/service/impl/StaffAgencyServiceImpl.java
index ae7a56de8f..ec96daa291 100644
--- a/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/service/impl/StaffAgencyServiceImpl.java
+++ b/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/service/impl/StaffAgencyServiceImpl.java
@@ -112,7 +112,9 @@ public class StaffAgencyServiceImpl implements StaffAgencyService {
     private boolean checkIssueProcessing(String gridId, List<GridProcessingCountResultDTO> issueProcessingList) {
         boolean flag = false;
         for (GridProcessingCountResultDTO gridProcessingCountResultDTO : issueProcessingList) {
-            if (gridId.equals(gridProcessingCountResultDTO.getGridId()) && gridProcessingCountResultDTO.getCount() > 0) {
+            if (gridId.equals(gridProcessingCountResultDTO.getGridId())
+                    && null!=gridProcessingCountResultDTO.getCount()
+                    && gridProcessingCountResultDTO.getCount() > 0) {
                 flag = true;
                 break;
             }
@@ -123,7 +125,9 @@ public class StaffAgencyServiceImpl implements StaffAgencyService {
     private boolean checkPartyMemberProcessing(String gridId, List<GridProcessingCountResultDTO> partyMemberProcessingList) {
         boolean flag = false;
         for (GridProcessingCountResultDTO gridProcessingCountResultDTO : partyMemberProcessingList) {
-            if (gridId.equals(gridProcessingCountResultDTO.getGridId()) && gridProcessingCountResultDTO.getCount() > 0) {
+            if (gridId.equals(gridProcessingCountResultDTO.getGridId())
+                    && null != gridProcessingCountResultDTO.getCount()
+                    && gridProcessingCountResultDTO.getCount() > 0) {
                 flag = true;
                 break;
             }
@@ -134,7 +138,9 @@ public class StaffAgencyServiceImpl implements StaffAgencyService {
     private boolean checkResiProcessing(String gridId, List<GridProcessingCountResultDTO> resiProcessingList) {
         boolean flag = false;
         for (GridProcessingCountResultDTO gridProcessingCountResultDTO : resiProcessingList) {
-            if (gridId.equals(gridProcessingCountResultDTO.getGridId()) && gridProcessingCountResultDTO.getCount() > 0) {
+            if (gridId.equals(gridProcessingCountResultDTO.getGridId())
+                    && null!=gridProcessingCountResultDTO.getCount()
+                    && gridProcessingCountResultDTO.getCount() > 0) {
                 flag = true;
                 break;
             }
@@ -145,7 +151,9 @@ public class StaffAgencyServiceImpl implements StaffAgencyService {
     private boolean checkGroupProcessing(String gridId, List<GridProcessingCountResultDTO> groupProcessingList) {
         boolean flag = false;
         for (GridProcessingCountResultDTO gridProcessingCountResultDTO : groupProcessingList) {
-            if (gridId.equals(gridProcessingCountResultDTO.getGridId()) && gridProcessingCountResultDTO.getCount() > 0) {
+            if (gridId.equals(gridProcessingCountResultDTO.getGridId())
+                    && null!=gridProcessingCountResultDTO.getCount()
+                    && gridProcessingCountResultDTO.getCount() > 0) {
                 flag = true;
                 break;
             }