Merge branch 'local_20221104' into haucheng_panzhihua

yanghui

2022-12-13 eaa9ab9582bf770813ac8c94cb362e504b255716

Merge branch 'local_20221104' into haucheng_panzhihua

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

@@ -499,8 +499,8 @@
        u.`name` sponsor_name,
        u.`nick_name` userNickName,
        u.phone sponsor_phone,
        count( DISTINCT pu.id ) giveThumbsUpNum,
        count( DISTINCT c.id ) commentNum,
        (SELECT  count(pu.id) FROM com_act_easy_photo_user pu WHERE pu.easy_photo_id = p.id) giveThumbsUpNum,
        (SELECT  count(c.id) FROM com_act_easy_photo_comment c WHERE c.easy_photo_id =p.id) commentNum,
        u.image_url,
        p.happen_addr,
        p.addr_remark,
@@ -524,9 +524,7 @@
        FROM
        com_act_easy_photo p
        JOIN sys_user u ON p.sponsor_id = u.user_id
        LEFT JOIN com_act_easy_photo_user pu ON p.id = pu.easy_photo_id
        LEFT JOIN sys_user su ON p.handler_id = su.user_id
        LEFT JOIN com_act_easy_photo_comment c ON p.id = c.easy_photo_id
        LEFT JOIN com_act_easy_photo_classify class ON p.classify_id = class.id
        LEFT JOIN (SELECT * FROM com_act_easy_photo_feedback WHERE `type` = 2) f ON p.id = f.easy_id
        <where> p.del_tag = 0