From 458a590d905246081332cba18997c9b5c68aa725 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期一, 10 五月 2021 15:55:07 +0800
Subject: [PATCH] Merge branch 'cedoodev' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/SysUserFeedbackDAO.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/SysUserFeedbackDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/SysUserFeedbackDAO.java
index d1b58f1..0dcf21b 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/SysUserFeedbackDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/SysUserFeedbackDAO.java
@@ -40,17 +40,19 @@
"f.photo_path,\n" +
"c.name communityName\n" +
"from sys_user_feedback f\n" +
- "join sys_user u on f.user_id=u.user_id\n" +
+ "left join sys_user u on f.user_id=u.user_id\n" +
+ "left join com_act c on u.community_id=c.community_id\n" +
+ "<where>" +
"<if test='pageFeedBackDTO.phone != null and pageFeedBackDTO.phone.trim() != ""'>" +
- "and u.phone=#{pageFeedBackDTO.phone}\n" +
+ "and u.phone like concat('%',#{pageFeedBackDTO.phone},'%') \n" +
" </if> " +
"<if test='pageFeedBackDTO.name != null and pageFeedBackDTO.name.trim() != ""'>" +
"and u.name like concat('%',#{pageFeedBackDTO.name},'%') \n" +
" </if> " +
"<if test='pageFeedBackDTO.nickName != null and pageFeedBackDTO.nickName.trim() != ""'>" +
- "and u.nick_name=like concat('%',#{pageFeedBackDTO.nickName},'%') \n" +
+ "and u.nick_name like concat('%',#{pageFeedBackDTO.nickName},'%') \n" +
" </if> " +
- "join com_act c on u.community_id=c.community_id\n" +
+ "</where> " +
"order by f.create_at desc\n" +
"</script>")
IPage<SysUserFeedbackVO> pageFeedback(Page page, @Param("pageFeedBackDTO") PageFeedBackDTO pageFeedBackDTO);
--
Gitblit v1.7.1