From 52ac05da703dab63ce49bc8f7871b6a7aa5611af Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期一, 04 十二月 2023 17:56:34 +0800
Subject: [PATCH] 修改机关单位服务统计排行报500
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/VolunteerMerchantMapper.xml | 2 +-
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java | 9 +++++++--
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java
index 5d8bfc6..7a98656 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java
@@ -1191,8 +1191,13 @@
}else {
//新数据，获取单位，社区名
vo.setUnitName(comActDAO.selectUnitName(vo.getUnitId()));
- if (ObjectUtils.isNotEmpty(vo.getCommunityId())) {
- vo.setCommunityName(comActDAO.selectById(vo.getCommunityId()).getName());
+ if (ObjectUtils.isNotEmpty(vo.getCommunityId()))
+ {
+ ComActDO actDO=comActDAO.selectById(vo.getCommunityId());
+ if(actDO!=null && !StringUtils.isEmpty(actDO.getName()))
+ {
+ vo.setCommunityName(actDO.getName());
+ }
}
unitActivityAnalysisVOS.add(vo);
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/VolunteerMerchantMapper.xml b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/VolunteerMerchantMapper.xml
index 7585b4c..c05ec09 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/VolunteerMerchantMapper.xml
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/VolunteerMerchantMapper.xml
@@ -349,7 +349,7 @@
FROM sys_user
<where>
1=1
- <if test="communityId!=null">
+ <if test="communityId!=null and communityId!='' ">
and community_id=#{communityId}
</if>
--
Gitblit v1.7.1