From 7fc75c2aa55fe1b13ca9a89c23eea01d2d8942af Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期二, 07 九月 2021 09:37:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into txb
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoDAO.java | 6 ++++--
1 files changed, 4 insertions(+), 2 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 be971e5..5d03b2f 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
@@ -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 != ""'>" +
"AND (class.`name` like concat(#{comActEasyPhotoVO.keyWord},'%') or p.detail like concat(#{comActEasyPhotoVO.keyWord},'%')) " +
--
Gitblit v1.7.1