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

CeDo

2021-04-29 12cbe6b75a2cd522dbff3e68df7b2f6f6b86bedf

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

@@ -42,8 +42,9 @@
   
   @Select("<script> " +
            "SELECT * \n" +
            "FROM\n" +
            "com_act_message t where t.community_id=#{comActMessageVO.communityId}\n" +
            "FROM \n" +
            " com_act_message t " +
         " 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 +70,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);