Merge remote-tracking branch 'origin/test' into test

huanghongfa

2021-05-07 0b8d3f2158d2cc97a6b73c6aa1d48e9e7335aede

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMessageDAO.java

@@ -29,7 +29,15 @@
   @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")