From eda58e0e6d4abdd2b060e28867d103045845aa69 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期一, 30 八月 2021 13:13:18 +0800
Subject: [PATCH] Merge branch 'test' into 'yuyue_dev'

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoDAO.java |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoDAO.java
index 6e51573..b4f3910 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoDAO.java
@@ -199,13 +199,15 @@
             "p.activity_id, " +
             "p.activity_amount, " +
             "count(pu.id)giveThumbsUpNum, " +
-            "p.handle_photo_list," +
             "c.name communityName," +
             "p.transfer_time," +
             "p.is_report_urban," +
             "p.transfer_reason," +
             "ca.`name` as classifyName," +
-            "p.urban_status " +
+            "p.urban_status, " +
+            "p.img_width, " +
+            "p.img_height, " +
+            "p.handle_photo_list " +
             "FROM " +
             "com_act_easy_photo p " +
             "JOIN sys_user u on p.sponsor_id=u.user_id " +
@@ -258,6 +260,8 @@
             "p.activity_amount, " +
             "p.classify_id, " +
             "class.`name` as classifyName, " +
+            "p.img_width, " +
+            "p.img_height, " +
             "p.examine_at  " +
             "FROM " +
             "com_act_easy_photo p " +
@@ -267,7 +271,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> " +
@@ -278,7 +282,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},'%'))   " +

--
Gitblit v1.7.1