张天森
2022-07-08 f9aff80b15b20394ec909ce9a1d4acda3775bd08
Merge remote-tracking branch 'origin/huacheng_zts' into huacheng_test
1个文件已修改
5 ■■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActNeighborCircleDOMapper.xml 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActNeighborCircleDOMapper.xml
@@ -303,8 +303,7 @@
        ,caa.community_id as communityId,cpm.id as memberId,cpm.name as memberName,cpcu.name as belongUnit,ca.name as belongCommunity,cpcu.belong_to
        FROM `com_act_activity` as caa
        left join com_act_act_sign as caas on caa.id=caas.activity_id
        <!--left join com_pb_member as cpm on caas.user_id=cpm.id-->
        left join com_pb_member as cpm on caa.sponsor_id=cpm.id
        left join sys_user as su on caa.sponsor_id=su.user_id
        left join com_pb_check_unit as cpcu on cpm.check_unit_id=cpcu.id
        left join com_act as ca on cpm.community_id=ca.community_id
        where caa.sponsor_id&lt;>''
@@ -316,7 +315,7 @@
            and belong_to=#{belongTo}
        </if>
        GROUP BY (caa.sponsor_id)
        having serviceTimes&lt;>'' and serviceTime&lt;>''
        having serviceTimes&lt;>'' and serviceTime&lt;>'' and memberName&lt;>''
    </select>
    <select id="institutionalPartyMemberActAnalysis"
            resultType="com.panzhihua.common.model.vos.neighbor.PartyMemberAnalysisVO">