From d49f6b9103cece847377bb63121639ff941a87c0 Mon Sep 17 00:00:00 2001
From: huanghongfa <18228131219@163.com>
Date: 星期五, 29 一月 2021 10:50:19 +0800
Subject: [PATCH] 首页展示
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java
index 45ed48f..5491e34 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java
@@ -92,7 +92,7 @@
"<if test='loginUserInfoVO.communityName != null and loginUserInfoVO.communityName.trim() != ""'>" +
"AND c.`area_name` like concat(#{loginUserInfoVO.communityName},'%') \n" +
" </if> " +
- " where u.community_id=#{loginUserInfoVO.communityId} " +
+ " where u.community_id=#{loginUserInfoVO.communityId} and u.type=1 " +
"<if test='loginUserInfoVO.name != null and loginUserInfoVO.name.trim() != ""'>" +
" and u.`name` like concat(#{loginUserInfoVO.name},'%') \n" +
" </if> " +
@@ -220,8 +220,8 @@
"GROUP BY u.community_id)t ORDER BY t.num desc limit 10")
List<DataKanbanDTO> selectCommunityActiveUserOrder();
@Select("SELECT \n" +
- "COUNT(u.user_id)allUser,\n" +
- "COUNT(case when u.is_volunteer=1 then u.user_id else null end )volunteerUser,\n" +
+ "COUNT(DISTINCT u.user_id)allUser,\n" +
+ "(select COUNT(m.id) from com_mng_volunteer_mng m where m.community_id=#{communityId} and m.`state`=2)volunteerUser,\n" +
"COUNT(case when u.is_partymember=1 then u.user_id else null end )partymemberUser,\n" +
"COUNT(h.id)house\n" +
"FROM\n" +
--
Gitblit v1.7.1