From 50e1eb020efe8da670b718d865fa4c1eaa61ee7d Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 20 五月 2021 19:51:09 +0800
Subject: [PATCH] 修改bug
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActSignDAO.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActSignDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActSignDAO.java
index 56c7bf8..6a22a31 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActSignDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActSignDAO.java
@@ -19,12 +19,14 @@
// 居民 党员 志愿者 1 2 3
@Select("<script> " +
"SELECT\n" +
- "a.id,\n" +
+ "u.user_id id,\n" +
"u.image_url,\n" +
"u.name,\n" +
+ "u.nick_name,\n" +
"case WHEN u.is_partymember = 1 THEN '党员' WHEN a.is_volunteer = 1 THEN '志愿者' ELSE '居民' END identity,\n" +
"u.phone,\n" +
- "a.create_at \n" +
+ "a.create_at, \n" +
+ "a.is_volunteer \n" +
"FROM\n" +
"com_act_act_sign a\n" +
"JOIN sys_user u ON a.user_id = u.user_id \n" +
@@ -45,6 +47,9 @@
"<if test='identity != null and identity.trim() != "" and identity==3'>" +
"AND a.is_volunteer=1 \n" +
" </if> " +
+ "<if test='type != null and type != 0'>" +
+ "AND a.is_volunteer=#{type}-1 \n" +
+ " </if> " +
" order by a.create_at desc "+
"</script>")
List<ActivitySignVO> listActivitySign(ActivitySignVO activitySignVO);
--
Gitblit v1.7.1