From 5d55062d003a17e197523f37d68d0e88ba727219 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期四, 20 五月 2021 19:13:48 +0800
Subject: [PATCH] Merge branch 'test' into 'master'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoDAO.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 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 f749652..c6aafec 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
@@ -56,7 +56,7 @@
"<if test='comActEasyPhotoVO.handlerName != null and comActEasyPhotoVO.handlerName.trim() != ""'>" +
"AND su.`name` like concat(#{comActEasyPhotoVO.handlerName},'%') \n" +
" </if> " +
- "where p.status !=2"+
+ "where p.del_tag = 0 and p.status !=2"+
"<if test='comActEasyPhotoVO.communityId != null and comActEasyPhotoVO.communityId != 0'>" +
" and p.community_id=#{comActEasyPhotoVO.communityId} " +
" </if> " +
@@ -111,7 +111,7 @@
"<if test='comActEasyPhotoVO.handlerName != null and comActEasyPhotoVO.handlerName.trim() != ""'>" +
"AND su.`name` like concat(#{comActEasyPhotoVO.handlerName},'%') \n" +
" </if> " +
- "where p.status=2 and p.is_need_feed_back=1 " +
+ "where p.del_tag = 0 and p.status=2 and p.is_need_feed_back=1 " +
"<if test='comActEasyPhotoVO.backUserId != null and comActEasyPhotoVO.backUserId != 0'>" +
"and p.handler_id=#{comActEasyPhotoVO.backUserId}"+
" </if> " +
@@ -163,14 +163,14 @@
"JOIN sys_user u on p.sponsor_id=u.user_id\n" +
"LEFT JOIN sys_user su on p.handler_id=su.user_id\n" +
"LEFT JOIN com_act_easy_photo_user pu on p.id=pu.easy_photo_id\n" +
- "WHERE p.id=#{id}")
+ "WHERE p.del_tag = 0 and p.id=#{id}")
ComActEasyPhotoVO detailEasyPhoto(Long id);
@Select("SELECT\n" +
"'1' type\n" +
"FROM\n" +
- "com_act_easy_photo p \n" +
+ " com_act_easy_photo p \n" +
"WHERE\n" +
- "p.community_id = #{communityId} \n" +
+ " p.del_tag = 0 and p.community_id = #{communityId} \n" +
"AND p.STATUS = 1 \n"+
"\n" +
"union all \n" +
@@ -178,9 +178,9 @@
"SELECT\n" +
"'1' type\n" +
"FROM\n" +
- "com_act_easy_photo p \n" +
+ " p.del_tag = 0 and com_act_easy_photo p \n" +
"WHERE\n" +
- "p.community_id = #{communityId} \n" +
+ " p.del_tag = 0 and p.community_id = #{communityId} \n" +
"AND p.`status` = 2 and p.is_need_feed_back=1 and p.handler_id=#{userId}\n"
)
List<TodoEventsVO> selectNeedToDo(@Param("communityId") Long communityId, @Param("userId") Long userId);
@@ -210,6 +210,7 @@
"left JOIN sys_user su ON p.handler_id = su.user_id \n" +
"left JOIN com_act_easy_photo_comment c ON p.id = c.easy_photo_id \n" +
" <where>" +
+ " p.del_tag = 0 " +
"<if test='comActEasyPhotoVO.communityId != null and comActEasyPhotoVO.communityId != 0'>" +
" and p.community_id=#{comActEasyPhotoVO.communityId} " +
" </if> " +
--
Gitblit v1.7.1