From b7694af918a917ad16a07f8cbf3ed48c462d8b0d Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 26 八月 2021 18:56:03 +0800
Subject: [PATCH] 修改bug
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoDAO.java | 14 ++++++++++----
1 files changed, 10 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 5ddca14..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,12 +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," +
- "p.urban_status " +
+ "ca.`name` as classifyName," +
+ "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 " +
@@ -212,6 +215,7 @@
"LEFT JOIN sys_user su1 on p.complete_id=su1.user_id " +
"LEFT JOIN com_act_easy_photo_user pu on p.id=pu.easy_photo_id " +
"LEFT JOIN com_act c on p.community_id=c.community_id " +
+ "left join com_act_easy_photo_classify ca on ca.id = p.classify_id " +
"WHERE p.del_tag = 0 and p.id=#{id}")
ComActEasyPhotoVO detailEasyPhoto(Long id);
@Select("SELECT " +
@@ -256,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 " +
@@ -265,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> " +
@@ -276,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 != ""'>" +
"AND (class.`name` like concat(#{comActEasyPhotoVO.keyWord},'%') or p.detail like concat(#{comActEasyPhotoVO.keyWord},'%')) " +
--
Gitblit v1.7.1