From 4b50ee7687be0c63bb5639156e4a3f6a15aaf37a Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期二, 07 九月 2021 14:52:06 +0800
Subject: [PATCH] Merge branch 'test' into 'test_bak'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMicroWishDAO.java | 5 +++--
1 files changed, 3 insertions(+), 2 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 bd1ec69..31460d0 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
@@ -75,7 +75,7 @@
"AND w.`status` = #{comActMicroWishVO.status} " +
" </if> " +
"<if test='comActMicroWishVO.status == 3 and comActMicroWishVO.isPageMyWish==null'>" +
- "AND w.`status` = 3 " +
+ "AND w.`status` in (2,3) " +
" </if> " +
"<if test='comActMicroWishVO.status != null and comActMicroWishVO.status!=0 and comActMicroWishVO.isPageMyWish!=null and comActMicroWishVO.status==1'>" +
"AND w.`status` =1 " +
@@ -121,6 +121,7 @@
"su.`name` responsible_name, " +
"w.form, " +
"w.reject_reason, " +
+ "w.community_id, " +
"w.examine_at, " +
"w.finish, " +
"w.finish_photo_path_list, " +
@@ -136,7 +137,7 @@
"w.evaluate " +
"FROM " +
"com_act_micro_wish w " +
- "JOIN sys_user u ON w.sponsor_id = u.user_id " +
+ "LEFT JOIN sys_user u ON w.sponsor_id = u.user_id " +
"LEFT JOIN com_pb_service_team su ON w.responsible_id = su.id " +
"LEFT JOIN com_act_micro_wish_user wu ON w.id = wu.micro_wish_id " +
"WHERE " +
--
Gitblit v1.7.1