From 8788a78ad30c1bb9d50d91b10e76d3ae47ed8da2 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期一, 07 六月 2021 09:28:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test_future_wangge' into test_future_wangge

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoDAO.java |   21 ++++++++++++++-------
 1 files changed, 14 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..c714db6 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
@@ -36,6 +36,8 @@
             "p.`photo_path_list`,\n" +
             "p.create_at,\n" +
             "p.feedback_at,\n" +
+            "p.is_report,\n" +
+            "p.is_publicity,\n" +
             "p.examine_at \n" +
             "FROM\n" +
             "com_act_easy_photo p\n" +
@@ -56,7 +58,7 @@
             "<if test='comActEasyPhotoVO.handlerName != null and comActEasyPhotoVO.handlerName.trim() != &quot;&quot;'>" +
             "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> " +
@@ -91,6 +93,8 @@
             "p.`photo_path_list`,\n" +
             "p.create_at,\n" +
             "p.feedback_at,\n" +
+            "p.is_report,\n" +
+            "p.is_publicity,\n" +
             "p.examine_at \n" +
             "FROM\n" +
             "com_act_easy_photo p\n" +
@@ -111,7 +115,7 @@
             "<if test='comActEasyPhotoVO.handlerName != null and comActEasyPhotoVO.handlerName.trim() != &quot;&quot;'>" +
             "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> " +
@@ -142,6 +146,7 @@
             "p.examine_at,\n" +
             "p.create_at,\n" +
             "u.`name` sponsorName,\n" +
+            "u.nick_name userNickName,\n" +
             "su.`name` handlerName,\n" +
             "u.`image_url`,\n" +
             "u.phone,\n" +
@@ -163,14 +168,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 +183,9 @@
             "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` = 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);
@@ -189,6 +194,7 @@
             "SELECT\n" +
             "p.id,\n" +
             "u.`name` sponsor_name,\n" +
+            "u.nick_name userNickName,\n" +
             "u.phone sponsor_phone,\n" +
             "count(DISTINCT pu.id)giveThumbsUpNum,\n" +
             "count(DISTINCT c.id)commentNum,\n" +
@@ -210,6 +216,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