From ec192c9a7385ce426a4340506b90acd78d9700aa Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期五, 02 四月 2021 16:10:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/SysUserFeedbackDAO.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 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 779db07..d1b58f1 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
@@ -41,15 +41,15 @@
"c.name communityName\n" +
"from sys_user_feedback f\n" +
"join sys_user u on f.user_id=u.user_id\n" +
- "<if test='pageFeedBackDTO.name != null and pageFeedBackDTO.name.trim() != ""'>" +
- "and u.name=#{pageFeedBackDTO.name}\n" +
- " </if> " +
- "<if test='pageFeedBackDTO.nickName != null and pageFeedBackDTO.nickName.trim() != ""'>" +
- "and u.nick_name=#{pageFeedBackDTO.nickName}\n" +
- " </if> " +
"<if test='pageFeedBackDTO.phone != null and pageFeedBackDTO.phone.trim() != ""'>" +
"and u.phone=#{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" +
+ " </if> " +
"join com_act c on u.community_id=c.community_id\n" +
"order by f.create_at desc\n" +
"</script>")
--
Gitblit v1.7.1