Merge remote-tracking branch 'origin/test' into txb

tangxiaobao

2021-09-07 7fc75c2aa55fe1b13ca9a89c23eea01d2d8942af

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoDAO.java

@@ -176,6 +176,7 @@
            "p.id, " +
            "p.sponsor_id, " +
            "p.feedback_at, " +
            "p.is_publicity, " +
            "p.examine_at, " +
            "p.create_at, " +
            "u.`name` sponsorName, " +
@@ -185,6 +186,7 @@
            "u.`image_url`, " +
            "u.phone, " +
            "p.detail, " +
            "p.lng_lat, " +
            "p.is_need_feed_back, " +
            "p.examine_at, " +
            "p.status, " +
@@ -271,7 +273,7 @@
            "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  " +
            " <where>" +
            " p.del_tag = 0 and p.is_publicity = 1 "  +
            " p.del_tag = 0 "  +
            "<if test='comActEasyPhotoVO.communityId != null and comActEasyPhotoVO.communityId != 0'>" +
            "  and p.community_id=#{comActEasyPhotoVO.communityId} " +
            " </if> " +
@@ -282,7 +284,7 @@
            "AND p.sponsor_id =#{comActEasyPhotoVO.sponsorId}  " +
            " </if> " +
            "<if test='comActEasyPhotoVO.sponsorId == null or comActEasyPhotoVO.sponsorId==0'>" +
            "AND p.`status` in (2,4)  " +
            "AND p.`status` in (2,4) and p.is_publicity = 1 " +
            " </if> " +
            "<if test='comActEasyPhotoVO.keyWord != null and comActEasyPhotoVO.keyWord != &quot;&quot;'>" +
            "AND (class.`name` like concat(#{comActEasyPhotoVO.keyWord},'%') or p.detail like concat(#{comActEasyPhotoVO.keyWord},'%'))   " +