From 34fcf32a24d06befd53c6e05ae9c41a4de24e71b Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期四, 15 七月 2021 10:00:00 +0800
Subject: [PATCH] Merge branch 'test' into 'master'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMessageDAO.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 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 743b2ca..b42ce60 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
@@ -29,12 +29,21 @@
@Select("select * from com_act_message_back where msg_id=#{id} order by create_at desc")
List<ComActMessageBackVO> selectMsgBackList(@Param("id")Long id);
- @Select("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})) order by create_at desc")
+ @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})))" +
+ "<if test='comActMessageVO.status != null'>" +
+ " and status=#{comActMessageVO.status} \n" +
+ " </if> " +
+ " order by create_at desc"+
+ "</script>")
IPage<PageComActMessageVO> pageSendMeMessageApplets(Page page, @Param("comActMessageVO")ComActMessageVO comActMessageVO);
@Select("select * from com_act_message where user_id=#{comActMessageVO.userId} order by create_at desc")
IPage<PageComActMessageVO> pageMyMessageApplets(Page page, @Param("comActMessageVO")ComActMessageVO comActMessageVO);
- @Select("select * from com_act_message where sendto_user_id=#{comActMessageVO.sendtoUserId} and ispublic=1")
+ @Select("select * from com_act_message where sendto_user_id=#{comActMessageVO.sendtoUserId} and ispublic=1 order by create_at desc ")
IPage<PageComActMessageVO> pageMessageByUserApplets(Page page, @Param("comActMessageVO")ComActMessageVO comActMessageVO);
@Update("update com_act_message set ispublic=#{ispublic} where id=#{id}")
--
Gitblit v1.7.1