From e3c5378b79d23f4cebb4059c78bfbdd32cd5a2f9 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期一, 26 四月 2021 14:02:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngVolunteerMngDAO.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngVolunteerMngDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngVolunteerMngDAO.java
index 68502b4..4de6c94 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngVolunteerMngDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngVolunteerMngDAO.java
@@ -58,12 +58,13 @@
"t.state,\n" +
"t.phone,\n" +
"t.apply_reson,\n" +
- "t.create_at \n" +
+ "t.create_at, " +
+ "t.submit_user_id \n" +
"FROM\n" +
"com_mng_volunteer_mng t\n" +
" RIGHT JOIN \n" +
- "(select phone, MAX(create_at)create_at from com_mng_volunteer_mng where state IN ( 1, 3 ) GROUP BY phone ) tmp \n" +
- "on t.create_at = tmp.create_at and t.phone=tmp.phone "+
+ "(select submit_user_id, MAX(create_at)create_at from com_mng_volunteer_mng where state IN ( 1, 3 ) GROUP BY submit_user_id ) tmp \n" +
+ "on t.create_at = tmp.create_at and t.submit_user_id=tmp.submit_user_id "+
"WHERE\n" +
"state in (1,3) and community_id=#{comMngVolunteerMngVO.communityId} \n" +
"<if test='comMngVolunteerMngVO.name != null and comMngVolunteerMngVO.name.trim() != ""'>" +
--
Gitblit v1.7.1