diff --git a/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-dev.yml b/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-dev.yml
index 66da251dc6..1192c903ed 100644
--- a/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-dev.yml
@@ -2,7 +2,7 @@ version: "3.7"
services:
gov-grid-server:
container_name: gov-grid-server-dev
- image: 192.168.1.130:10080/epmet-cloud-dev/gov-grid-server:0.3.19
+ image: 192.168.1.130:10080/epmet-cloud-dev/gov-grid-server:0.3.20
ports:
- "8097:8097"
network_mode: host # 使用现有网络
diff --git a/epmet-module/gov-grid/gov-grid-server/pom.xml b/epmet-module/gov-grid/gov-grid-server/pom.xml
index 2fb2fabe4d..6d9168a888 100644
--- a/epmet-module/gov-grid/gov-grid-server/pom.xml
+++ b/epmet-module/gov-grid/gov-grid-server/pom.xml
@@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4.0.0
- 0.3.19
+ 0.3.20
com.epmet
gov-grid
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 b06f687de1..e7cfdcbd6c 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
@@ -54,10 +54,11 @@ public class RemindServiceImpl implements RemindService {
logger.error(String.format("调用gov-org-server服务查询工作人员网格列表失败返回结果", govOrgResult.toString()));
}else{
List gridList = govOrgResult.getData();
+ logger.info("我的网格列表"+gridList.size());
for (CustomerGridByUserIdResultDTO gridInfo : gridList) {
if(formDTO.getGridId().equals(gridInfo.getGridId())){
//查询非当前网格的
- break;
+ continue;
}
//其他网格,只要存在有待办事项的网格,就需要在工作首页网格名称后面显示红点
List functionList = this.getRedDotFunctionList(gridInfo.getGridId());
diff --git a/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-dev.yml b/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-dev.yml
index 2422340372..005b5ad505 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-dev.yml
@@ -2,7 +2,7 @@ version: "3.7"
services:
resi-partymember-server:
container_name: resi-partymember-server-dev
- image: 192.168.1.130:10080/epmet-cloud-dev/resi-partymember-server:0.3.23
+ image: 192.168.1.130:10080/epmet-cloud-dev/resi-partymember-server:0.3.25
ports:
- "8096:8096"
network_mode: host # 使用现有网络
diff --git a/epmet-module/resi-partymember/resi-partymember-server/pom.xml b/epmet-module/resi-partymember/resi-partymember-server/pom.xml
index 083d7af327..c8bdcb6c56 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/pom.xml
+++ b/epmet-module/resi-partymember/resi-partymember-server/pom.xml
@@ -2,7 +2,7 @@
4.0.0
- 0.3.23
+ 0.3.25
com.epmet
resi-partymember
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/redis/ResiPartyMemberRedis.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/redis/ResiPartyMemberRedis.java
index 2ca0edbd36..0a811c5244 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/redis/ResiPartyMemberRedis.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/redis/ResiPartyMemberRedis.java
@@ -79,7 +79,7 @@ public class ResiPartyMemberRedis {
Long auditingPartyMemberCount = 0L;
try {
String workGrassrootsPartyAuthRedDotKey = ResiPartyMemberRedisKeys.getWorkGrassrootsResiRedDotKey(gridId);
- auditingPartyMemberCount = redisUtils.incrementAndGet(workGrassrootsPartyAuthRedDotKey);
+ auditingPartyMemberCount = redisUtils.decrementAndGet(workGrassrootsPartyAuthRedDotKey);
logger.info(String.format("政府端(wxmp)审核热心居民申请,更新redis-reddot值成功,key[%s],Value[%s]", workGrassrootsPartyAuthRedDotKey, auditingPartyMemberCount));
} catch (Exception e) {
logger.error(String.format("政府端(wxmp)审核热心居民申请,更新redis-reddot值异常%s", e.getMessage()));
@@ -119,7 +119,7 @@ public class ResiPartyMemberRedis {
Long auditingPartyMemberCount = 0L;
try {
String workGrassrootsPartyAuthRedDotKey = ResiPartyMemberRedisKeys.getWorkGrassrootsPartyAuthRedDotKey(gridId);
- auditingPartyMemberCount = redisUtils.incrementAndGet(workGrassrootsPartyAuthRedDotKey);
+ auditingPartyMemberCount = redisUtils.decrementAndGet(workGrassrootsPartyAuthRedDotKey);
logger.info(String.format("居民端党员认证补充信息提交,更新redis-reddot值成功,key[%s],Value[%s]", workGrassrootsPartyAuthRedDotKey, auditingPartyMemberCount));
} catch (Exception e) {
logger.error(String.format("居民端党员认证补充信息提交,更新redis-reddot值异常%s", e.getMessage()));