diff --git a/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/form/RedDotFormDTO.java b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/form/RedDotFormDTO.java
index 52b9d21b44..be67ff5a33 100644
--- a/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/form/RedDotFormDTO.java
+++ b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/form/RedDotFormDTO.java
@@ -23,7 +23,7 @@ public class RedDotFormDTO implements Serializable {
     /**
      * 网格ID
      */
-    @NotBlank(message = "网格id不能为空")
+    //@NotBlank(message = "网格id不能为空")
     private String gridId;
 }
 
diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/RemindServiceImpl.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/RemindServiceImpl.java
index 49c0fb8129..a2916ee01c 100644
--- a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/RemindServiceImpl.java
+++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/RemindServiceImpl.java
@@ -14,6 +14,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -228,14 +229,20 @@ public class RemindServiceImpl implements RemindService {
             Result<List<GridProcessingCountResultDTO>> groupResult = resiGroupFeignClient.queryGroupProcessingCount(gridIdList);
             if (groupResult.success() && !CollectionUtils.isEmpty(groupResult.getData())) {
                 groupResult.getData().forEach(groupDto -> {
-                    //当前网格
-                    if (formDTO.getGridId().equals(groupDto.getGridId()) && groupDto.getCount() > 0) {
+                    if (StringUtils.isEmpty(formDTO.getGridId())) {
                         functionList.add(WorkGrassRootsFunctionConstant.WORK_GRASSROOTS_GROUP);
                         details.add(new RedDotDetialDTO(WorkGrassRootsFunctionConstant.WORK_GRASSROOTS_GROUP, groupDto.getCount()));
-                    }
-                    //其他网格
-                    if (!formDTO.getGridId().equals(groupDto.getGridId()) && groupDto.getCount() > 0) {
-                        redDotResultDTO.setOtherGridRedDot(true);
+                        redDotResultDTO.setOtherGridRedDot(false);
+                    } else {
+                        //当前网格
+                        if (formDTO.getGridId().equals(groupDto.getGridId()) && groupDto.getCount() > 0) {
+                            functionList.add(WorkGrassRootsFunctionConstant.WORK_GRASSROOTS_GROUP);
+                            details.add(new RedDotDetialDTO(WorkGrassRootsFunctionConstant.WORK_GRASSROOTS_GROUP, groupDto.getCount()));
+                        }
+                        //其他网格
+                        if (!formDTO.getGridId().equals(groupDto.getGridId()) && groupDto.getCount() > 0) {
+                            redDotResultDTO.setOtherGridRedDot(true);
+                        }
                     }
                 });
             }
@@ -244,14 +251,20 @@ public class RemindServiceImpl implements RemindService {
             Result<List<GridProcessingCountResultDTO>> resiResult = resiPartymemberFeignClient.queryResiProcessingCount(gridIdList);
             if (resiResult.success() && !CollectionUtils.isEmpty(resiResult.getData())) {
                 resiResult.getData().forEach(resiDto -> {
-                    //当前网格
-                    if (formDTO.getGridId().equals(resiDto.getGridId()) && resiDto.getCount() > 0) {
+                    if (StringUtils.isEmpty(formDTO.getGridId())) {
                         functionList.add(WorkGrassRootsFunctionConstant.WORK_GRASSROOTS_RESI);
                         details.add(new RedDotDetialDTO(WorkGrassRootsFunctionConstant.WORK_GRASSROOTS_RESI, resiDto.getCount()));
-                    }
-                    //其他网格
-                    if (!formDTO.getGridId().equals(resiDto.getGridId()) && resiDto.getCount() > 0) {
-                        redDotResultDTO.setOtherGridRedDot(true);
+                        redDotResultDTO.setOtherGridRedDot(false);
+                    } else {
+                        //当前网格
+                        if (formDTO.getGridId().equals(resiDto.getGridId()) && resiDto.getCount() > 0) {
+                            functionList.add(WorkGrassRootsFunctionConstant.WORK_GRASSROOTS_RESI);
+                            details.add(new RedDotDetialDTO(WorkGrassRootsFunctionConstant.WORK_GRASSROOTS_RESI, resiDto.getCount()));
+                        }
+                        //其他网格
+                        if (!formDTO.getGridId().equals(resiDto.getGridId()) && resiDto.getCount() > 0) {
+                            redDotResultDTO.setOtherGridRedDot(true);
+                        }
                     }
                 });
             }
@@ -260,14 +273,20 @@ public class RemindServiceImpl implements RemindService {
             Result<List<GridProcessingCountResultDTO>> partyResult = resiPartymemberFeignClient.queryPartyMemberProcessingCount(gridIdList);
             if (partyResult.success() && !CollectionUtils.isEmpty(partyResult.getData())) {
                 partyResult.getData().forEach(partyDto -> {
-                    //当前网格
-                    if (formDTO.getGridId().equals(partyDto.getGridId()) && partyDto.getCount() > 0) {
+                    if (StringUtils.isEmpty(formDTO.getGridId())) {
                         functionList.add(WorkGrassRootsFunctionConstant.WORK_GRASSROOTS_PARTYAUTH);
                         details.add(new RedDotDetialDTO(WorkGrassRootsFunctionConstant.WORK_GRASSROOTS_PARTYAUTH, partyDto.getCount()));
-                    }
-                    //其他网格
-                    if (!formDTO.getGridId().equals(partyDto.getGridId()) && partyDto.getCount() > 0) {
-                        redDotResultDTO.setOtherGridRedDot(true);
+                        redDotResultDTO.setOtherGridRedDot(false);
+                    } else {
+                        //当前网格
+                        if (formDTO.getGridId().equals(partyDto.getGridId()) && partyDto.getCount() > 0) {
+                            functionList.add(WorkGrassRootsFunctionConstant.WORK_GRASSROOTS_PARTYAUTH);
+                            details.add(new RedDotDetialDTO(WorkGrassRootsFunctionConstant.WORK_GRASSROOTS_PARTYAUTH, partyDto.getCount()));
+                        }
+                        //其他网格
+                        if (!formDTO.getGridId().equals(partyDto.getGridId()) && partyDto.getCount() > 0) {
+                            redDotResultDTO.setOtherGridRedDot(true);
+                        }
                     }
                 });
             }
@@ -276,14 +295,20 @@ public class RemindServiceImpl implements RemindService {
             Result<List<GridProcessingCountResultDTO>> issueResult = govIssueFeignClient.queryVotingIssueCount(gridIdList);
             if (issueResult.success() && !CollectionUtils.isEmpty(issueResult.getData())) {
                 issueResult.getData().forEach(issueDto -> {
-                    //当前网格
-                    if (formDTO.getGridId().equals(issueDto.getGridId()) && issueDto.getCount() > 0) {
+                    if (StringUtils.isEmpty(formDTO.getGridId())) {
                         functionList.add(WorkGrassRootsFunctionConstant.WORK_GRASSROOTS_ISSUE);
                         details.add(new RedDotDetialDTO(WorkGrassRootsFunctionConstant.WORK_GRASSROOTS_ISSUE, issueDto.getCount()));
-                    }
-                    //其他网格
-                    if (!formDTO.getGridId().equals(issueDto.getGridId()) && issueDto.getCount() > 0) {
-                        redDotResultDTO.setOtherGridRedDot(true);
+                        redDotResultDTO.setOtherGridRedDot(false);
+                    } else {
+                        //当前网格
+                        if (formDTO.getGridId().equals(issueDto.getGridId()) && issueDto.getCount() > 0) {
+                            functionList.add(WorkGrassRootsFunctionConstant.WORK_GRASSROOTS_ISSUE);
+                            details.add(new RedDotDetialDTO(WorkGrassRootsFunctionConstant.WORK_GRASSROOTS_ISSUE, issueDto.getCount()));
+                        }
+                        //其他网格
+                        if (!formDTO.getGridId().equals(issueDto.getGridId()) && issueDto.getCount() > 0) {
+                            redDotResultDTO.setOtherGridRedDot(true);
+                        }
                     }
                 });
             }
@@ -292,14 +317,21 @@ public class RemindServiceImpl implements RemindService {
             Result<List<GridAuditingBadgeCountResultDTO>> badgeResult = epmetUserOpenFeignClient.queryGridAuditingBadgeCount(gridIdList);
             if (badgeResult.success() && !CollectionUtils.isEmpty(badgeResult.getData())) {
                 badgeResult.getData().forEach(badgeDto -> {
-                    //当前网格
-                    if (formDTO.getGridId().equals(badgeDto.getGridId()) && badgeDto.getCount() > 0) {
+
+                    if (StringUtils.isEmpty(formDTO.getGridId())) {
                         functionList.add(WorkGrassRootsFunctionConstant.WORK_GRASSROOTS_BADGE);
                         details.add(new RedDotDetialDTO(WorkGrassRootsFunctionConstant.WORK_GRASSROOTS_BADGE, badgeDto.getCount()));
-                    }
-                    //其他网格
-                    if (!formDTO.getGridId().equals(badgeDto.getGridId()) && badgeDto.getCount() > 0) {
-                        redDotResultDTO.setOtherGridRedDot(true);
+                        redDotResultDTO.setOtherGridRedDot(false);
+                    } else {
+                        //当前网格
+                        if (formDTO.getGridId().equals(badgeDto.getGridId()) && badgeDto.getCount() > 0) {
+                            functionList.add(WorkGrassRootsFunctionConstant.WORK_GRASSROOTS_BADGE);
+                            details.add(new RedDotDetialDTO(WorkGrassRootsFunctionConstant.WORK_GRASSROOTS_BADGE, badgeDto.getCount()));
+                        }
+                        //其他网格
+                        if (!formDTO.getGridId().equals(badgeDto.getGridId()) && badgeDto.getCount() > 0) {
+                            redDotResultDTO.setOtherGridRedDot(true);
+                        }
                     }
                 });
             }