From 179d69e6d1e8f18270e7cf25c0c16bf1a0ac0352 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期六, 23 七月 2022 14:59:31 +0800
Subject: [PATCH] bug修改
---
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberWestServiceImpl.java | 24 +++++++++++++-----------
1 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberWestServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberWestServiceImpl.java
index 5e0e2ff..0e52346 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberWestServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberWestServiceImpl.java
@@ -754,17 +754,19 @@
log.error("年龄转义失败");
}
//查询党员统计数据
- ComDataStatisticsMemberVo statisticsMemberVo = comPbMemberWestDAO.getMemberStatistics(member.getUserId(),member.getCommunityId());
- if(statisticsMemberVo != null){
- member.setPartyActivityCount(statisticsMemberVo.getPartyActivityCount());
- member.setPartyActivityDuration(statisticsMemberVo.getPartyActivityDuration());
- member.setVolunteerActivityCount(statisticsMemberVo.getVolunteerActivityCount());
- member.setVolunteerActivityDuration(statisticsMemberVo.getVolunteerActivityDuration());
- member.setVolunteerActivityIntegral(statisticsMemberVo.getVolunteerActivityIntegral());
- member.setWishCount(statisticsMemberVo.getWishCount());
- member.setEasyCount(statisticsMemberVo.getEasyCount());
- member.setActivityCount(member.getPartyActivityCount() + member.getVolunteerActivityCount());
- member.setActivityDuration(member.getPartyActivityDuration() + member.getVolunteerActivityDuration());
+ if(member.getUserId()!=null&&member.getCommunityId()!=null){
+ ComDataStatisticsMemberVo statisticsMemberVo = comPbMemberWestDAO.getMemberStatistics(member.getUserId(),member.getCommunityId());
+ if(statisticsMemberVo != null){
+ member.setPartyActivityCount(statisticsMemberVo.getPartyActivityCount());
+ member.setPartyActivityDuration(statisticsMemberVo.getPartyActivityDuration());
+ member.setVolunteerActivityCount(statisticsMemberVo.getVolunteerActivityCount());
+ member.setVolunteerActivityDuration(statisticsMemberVo.getVolunteerActivityDuration());
+ member.setVolunteerActivityIntegral(statisticsMemberVo.getVolunteerActivityIntegral());
+ member.setWishCount(statisticsMemberVo.getWishCount());
+ member.setEasyCount(statisticsMemberVo.getEasyCount());
+ member.setActivityCount(member.getPartyActivityCount() + member.getVolunteerActivityCount());
+ member.setActivityDuration(member.getPartyActivityDuration() + member.getVolunteerActivityDuration());
+ }
}
});
return R.ok(memberPage);
--
Gitblit v1.7.1