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); } 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>
