From dd031a2d62991222ca682bd3c687bf47f46d2d6d Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期一, 10 十月 2022 17:15:00 +0800
Subject: [PATCH] update
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMessageDAO.java | 7 ++++---
1 files changed, 4 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 739cd22..1b9eec5 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
@@ -30,8 +30,9 @@
List<ComActMessageBackVO> selectMsgBackList(@Param("id") Long id);
@Select("<script>" + "select * from com_act_message " + " where "
- + " ((sendto_user_id in (select id from com_pb_member_role t1 where t1.phone=#{comActMessageVO.phone})) "
- + " or (sendto_user_id in (select id from com_pb_service_team t2 where t2.phone=#{comActMessageVO.phone})))"
+ + " ((sendto_user_id in (select id from com_pb_member_role t1 where t1.phone=#{comActMessageVO.phone}) AND type = 2) "
+ + " or (sendto_user_id in (select id from com_pb_service_team t2 where t2.phone=#{comActMessageVO.phone}) AND type = 1) "
+ + " or (sendto_user_id in (select id from com_act_dpc t3 where t3.phone=#{comActMessageVO.phone}) AND type = 3)) "
+ "<if test='comActMessageVO.status != null'>" + " and status=#{comActMessageVO.status} \n" + " </if> "
+ " order by create_at desc" + "</script>")
IPage<PageComActMessageVO> pageSendMeMessageApplets(Page page,
@@ -52,7 +53,7 @@
+ "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"
+ + " where t.community_id = ${comActMessageVO.communityId}\n"
+ "<if test='comActMessageVO.userAccount != null and comActMessageVO.userAccount.trim() != ""'>"
+ " and u.phone=#{comActMessageVO.userAccount} \n" + " </if> "
+ "<if test='comActMessageVO.userName != null and comActMessageVO.userName.trim() != ""'>"
--
Gitblit v1.7.1