From 712c8d226605b58c584135452f1b272f4971cb00 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 15 May 2020 11:32:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=85=E5=8A=9E=E7=BA=A2=E7=82=B9=E6=8F=90?=
 =?UTF-8?q?=E9=86=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/service/impl/IssueServiceImpl.java  | 6 +++++-
 .../modules/group/service/impl/ResiGroupServiceImpl.java    | 6 +++++-
 .../service/impl/PartymemberInfoServiceImpl.java            | 6 +++++-
 .../service/impl/ResiWarmheartedApplyServiceImpl.java       | 6 +++++-
 4 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java
index 2813b0f98c..6e45ccf40a 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java
@@ -197,7 +197,11 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
 			GridVotingIssueCountResultDTO gridVotingIssueCountResultDTO = new GridVotingIssueCountResultDTO();
 			gridVotingIssueCountResultDTO.setGridId(gridId);
 			Long auditingCount = govIssueRedis.queryVotingIssueCount(gridId);
-			gridVotingIssueCountResultDTO.setCount(auditingCount);
+			if (null == auditingCount) {
+				gridVotingIssueCountResultDTO.setCount(0L);
+			} else {
+				gridVotingIssueCountResultDTO.setCount(auditingCount);
+			}
 			list.add(gridVotingIssueCountResultDTO);
 		}
 		return list;
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java
index 3d5b6e2f1d..97c4b17d1a 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java
@@ -791,7 +791,11 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 			GroupProcessingCountResultDTO resultDTO=new GroupProcessingCountResultDTO();
 			resultDTO.setGridId(gridId);
 			Long auditingCount=resiGroupRedis.getWorkGrassrootsGroupRedDotValue(gridId);
-			resultDTO.setCount(auditingCount);
+			if (null == auditingCount) {
+				resultDTO.setCount(0L);
+			} else {
+				resultDTO.setCount(auditingCount);
+			}
 			list.add(resultDTO);
 		}
 		return list;
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberInfoServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberInfoServiceImpl.java
index 732bcf1d83..e5873d7115 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberInfoServiceImpl.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberInfoServiceImpl.java
@@ -209,7 +209,11 @@ public class PartymemberInfoServiceImpl extends BaseServiceImpl<PartymemberInfoD
 			PartyAuthProcessingCountResultDTO partyAuthProcessingCountResultDTO = new PartyAuthProcessingCountResultDTO();
 			partyAuthProcessingCountResultDTO.setGridId(gridId);
 			Long auditingPartyMember = resiPartyMemberRedis.queryPartyAuthProcessingCount(gridId);
-			partyAuthProcessingCountResultDTO.setCount(auditingPartyMember);
+			if (null == auditingPartyMember) {
+				partyAuthProcessingCountResultDTO.setCount(0L);
+			} else {
+				partyAuthProcessingCountResultDTO.setCount(auditingPartyMember);
+			}
 			list.add(partyAuthProcessingCountResultDTO);
 		}
 		return list;
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedApplyServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedApplyServiceImpl.java
index 8ddb224bf0..500f176c60 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedApplyServiceImpl.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedApplyServiceImpl.java
@@ -506,7 +506,11 @@ public class ResiWarmheartedApplyServiceImpl extends BaseServiceImpl<ResiWarmhea
 			ResiProcessingCountResultDTO resiProcessingCountResultDTO = new ResiProcessingCountResultDTO();
 			resiProcessingCountResultDTO.setGridId(gridId);
 			Long auditingResi = resiPartyMemberRedis.queryResiProcessingCount(gridId);
-			resiProcessingCountResultDTO.setCount(auditingResi);
+			if (null == auditingResi) {
+				resiProcessingCountResultDTO.setCount(0L);
+			} else {
+				resiProcessingCountResultDTO.setCount(auditingResi);
+			}
 			list.add(resiProcessingCountResultDTO);
 		}
 		return list;