From 6cbbbc92f623c83e918ef0f2eea8ff82cc920b1b Mon Sep 17 00:00:00 2001
From: DESKTOP-71BH0QO\L、ming <172680469@qq.com>
Date: 星期五, 30 四月 2021 10:57:04 +0800
Subject: [PATCH] Add:添加邻里圈删除

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMessageDAO.java |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMessageDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMessageDAO.java
index d54ae34..743b2ca 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMessageDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMessageDAO.java
@@ -41,9 +41,11 @@
 	void updatePublic(@Param("ispublic") Integer ispublic,@Param("id") Long id);
 	
 	@Select("<script> " +
-            "SELECT * \n" +
-            "FROM\n" +
-            "com_act_message t where t.community_id=#{comActMessageVO.communityId}\n" +
+            "SELECT t.id,t.msg_content,t.photo_pah,t.phone,t.sendto_user_id,t.sendto_user_name,t.status,t.ispublic," +
+			"t.user_id,t.user_account,t.user_name,t.user_phone,t.community_id,t.create_at,t.type, u.phone as userAccount \n" +
+            "FROM \n" +
+            " com_act_message t LEFT JOIN sys_user u ON t.user_id = u.user_id " +
+			" where t.community_id=#{comActMessageVO.communityId}\n" +
             "<if test='comActMessageVO.userAccount != null and comActMessageVO.userAccount.trim() != &quot;&quot;'>" +
             " and t.user_account=#{comActMessageVO.userAccount} \n" +
             " </if> " +
@@ -69,6 +71,9 @@
             "AND t.create_at BETWEEN #{comActMessageVO.publishAtBegin} \n" +
             "AND #{comActMessageVO.publishAtEnd} \n" +
             " </if> " +
+			"<if test='comActMessageVO.type != null and comActMessageVO.type !=0'>" +
+			" AND t.type=#{comActMessageVO.type} \n" +
+			" </if> " +
             " order by create_at desc"+
             "</script>")
 	IPage<PageComActMessageVO> pageMyCommunityMessageApplets(Page page, @Param("comActMessageVO")ComActMessageVO comActMessageVO);

--
Gitblit v1.7.1