From 0bf174be571c53b8af796eca4b51fcd3edec1657 Mon Sep 17 00:00:00 2001
From: DESKTOP-71BH0QO\L、ming <172680469@qq.com>
Date: 星期日, 25 四月 2021 21:55:43 +0800
Subject: [PATCH] no

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActSignDAO.java |    8 ++++++--
 1 files changed, 6 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..b837c00 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,13 @@
 //    居民 党员 志愿者 1 2 3
     @Select("<script> " +
             "SELECT\n" +
-            "a.id,\n" +
+            "u.user_id id,\n" +
             "u.image_url,\n" +
             "u.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 +46,9 @@
             "<if test='identity != null and identity.trim() != &quot;&quot; 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