From 5f349fe34e3e33625f8593ec1b616f0c4528a12c Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期一, 27 九月 2021 10:33:45 +0800
Subject: [PATCH] Merge branch 'test' into 'test_bak'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMicroWishDAO.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMicroWishDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMicroWishDAO.java
index a5d58e1..8fc1bff 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMicroWishDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMicroWishDAO.java
@@ -56,9 +56,6 @@
"com_act_micro_wish w " +
"left join com_act_micro_wish_user wu on w.id=wu.micro_wish_id "+
"left JOIN sys_user u ON w.sponsor_id = u.user_id " +
- "<if test='comActMicroWishVO.sponsorName != null and comActMicroWishVO.sponsorName.trim() != ""'>" +
- "AND u.name like concat(#{comActMicroWishVO.sponsorName},'%') " +
- " </if> " +
"<if test='comActMicroWishVO.responsibleName == null or comActMicroWishVO.responsibleName.trim() == ""'>" +
"LEFT JOIN sys_user su1 ON w.responsible_id = su1.user_id " +
" </if> " +
@@ -101,6 +98,9 @@
"<if test='comActMicroWishVO.backUserId != null and comActMicroWishVO.backUserId != 0 and comActMicroWishVO.status==0 '>" +
"and (w.status in(1,2,4,5,6) or (w.status=3 and w.responsible_id =#{comActMicroWishVO.backUserId})) " +
" </if> " +
+ "<if test='comActMicroWishVO.sponsorName != null and comActMicroWishVO.sponsorName.trim() != ""'>" +
+ "AND u.name like concat(#{comActMicroWishVO.sponsorName},'%') " +
+ " </if> " +
" </where>" +
" group by w.id "+
"ORDER BY w.create_at desc "+
--
Gitblit v1.7.1