党建相关bug修改

101captain

2022-03-30 753066162d54d13da53f21e2947494189aba0b29

党建相关bug修改

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActActEvaluateMapper.xml

@@ -74,16 +74,12 @@
        caae.evaluate_content,
        su.`name`,
        su.phone,
        CASE
        WHEN su.is_partymember = 1 THEN
        '党员'
        WHEN caae.is_volunteer = 1 THEN
        '志愿者' ELSE '居民'
        END `identity`
        CASE WHEN t.type = 1 THEN '志愿者' WHEN t.type=2 THEN '居民' ELSE '党员' END identity

        FROM
        com_act_act_evaluate caae
        LEFT JOIN sys_user su ON caae.user_id = su.user_id
        left join com_act_activity t on caae.activity_id = t.id
        where caae.activity_id = #{comActActEvaluateVO.activityId}
        <if test="comActActEvaluateVO.phone != null and comActActEvaluateVO.phone !=''">
            AND su.phone = #{comActActEvaluateVO.phone}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActActRegistMapper.xml

@@ -76,17 +76,12 @@
        su.`name`,
        su.phone,
        su.tags,
        CASE

        WHEN su.is_partymember = 1 THEN
        '党员'
        WHEN caar.is_volunteer = 1 THEN
        '志愿者' ELSE '居民'
        END identity
        CASE WHEN t.type = 1 THEN '志愿者' WHEN t.type=2 THEN '居民' ELSE '党员' END identity

        FROM
        com_act_act_regist caar
        LEFT JOIN sys_user su ON caar.user_id = su.user_id
        left join com_act_activity t on caar.activity_id = t.id
        where caar.activity_id = #{comActActRegistVO.activityId}
        <if test="comActActRegistVO.phone != null and comActActRegistVO.phone !=''">
            AND su.phone = #{comActActRegistVO.phone}