From a7002e25ec105e5f73c27f91944f1c0b4991c355 Mon Sep 17 00:00:00 2001 From: puhanshu <a9236326> Date: 星期四, 30 十二月 2021 14:23:41 +0800 Subject: [PATCH] Merge branch 'master' into test --- springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMessageDAO.java | 2 +- 1 files changed, 1 insertions(+), 1 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..84edbb2 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 @@ -52,7 +52,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