From 17bccd09afb6e6a4fffa0409d7d5285e88442103 Mon Sep 17 00:00:00 2001
From: huanghongfa <18228131219@163.com>
Date: 星期四, 31 十二月 2020 16:05:57 +0800
Subject: [PATCH] 志愿者团新增接口

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActSignDAO.java |   13 +++++++------
 1 files changed, 7 insertions(+), 6 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 51d15a2..56c7bf8 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
@@ -16,6 +16,7 @@
  **/
 @Mapper
 public interface ComActActSignDAO extends BaseMapper<ComActActSignDO> {
+//    居民 党员 志愿者 1 2 3
     @Select("<script> " +
             "SELECT\n" +
             "a.id,\n" +
@@ -35,14 +36,14 @@
             "<if test='name != null and name.trim() != &quot;&quot;'>" +
             "AND u.`name` = #{name} \n" +
             " </if> " +
-            "<if test='identity != null and identity.trim() != &quot;&quot; and identity==党员.toString()'>" +
-            "AND is_partymember = 1 \n" +
+            "<if test='identity != null and identity.trim() != &quot;&quot; and identity==1'>" +
+            "AND u.is_partymember = 0 and a.is_volunteer=0 \n" +
             " </if> " +
-            "<if test='identity != null and identity.trim() != &quot;&quot; and identity==志愿者.toString()'>" +
-            "AND is_partymember = 2 and is_volunteer=1  \n" +
+            "<if test='identity != null and identity.trim() != &quot;&quot; and identity==2'>" +
+            "AND u.is_partymember = 1   \n" +
             " </if> " +
-            "<if test='identity != null and identity.trim() != &quot;&quot; and identity==居民.toString()'>" +
-            "AND is_partymember = 2 and is_volunteer=2  \n" +
+            "<if test='identity != null and identity.trim() != &quot;&quot; and identity==3'>" +
+            "AND a.is_volunteer=1  \n" +
             " </if> " +
             " order by a.create_at desc "+
             "</script>")

--
Gitblit v1.7.1