From 81c27e8f76f397c3a976b52d5cd43e201718f1f2 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期三, 30 三月 2022 16:54:19 +0800
Subject: [PATCH] 党建相关bug修改
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActActSignMapper.xml | 2 +-
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActActEvaluateMapper.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActActEvaluateMapper.xml b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActActEvaluateMapper.xml
index a5b6e67..ffa6690 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActActEvaluateMapper.xml
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActActEvaluateMapper.xml
@@ -80,7 +80,7 @@
caae.evaluate_content,
su.`name`,
su.phone,
- CASE WHEN t.type = 1 THEN '志愿者' WHEN t.type=2 THEN '居民' ELSE '党员' END identity
+ CASE WHEN t.type = 1 and caae.is_volunteer = 1 THEN '志愿者' WHEN t.type = 1 and caae.is_volunteer = 0 THEN '居民' WHEN t.type=2 THEN '居民' ELSE '党员' END identity
FROM
com_act_act_evaluate caae
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActActSignMapper.xml b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActActSignMapper.xml
index 77cffb0..f5c6965 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActActSignMapper.xml
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActActSignMapper.xml
@@ -32,7 +32,7 @@
su.`name`,
su.phone,
su.tags,
- CASE WHEN t.type = 1 THEN '志愿者' WHEN t.type=2 THEN '居民' ELSE '党员' END identity
+ CASE WHEN t.type = 1 and caas.is_volunteer = 1 THEN '志愿者' WHEN t.type = 1 and caas.is_volunteer = 0 THEN '居民' WHEN t.type=2 THEN '居民' ELSE '党员' END identity
FROM
com_act_act_sign caas
--
Gitblit v1.7.1