From bb2da5de17a6d959f91738c17868b312ee14e86b Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 20 五月 2021 19:51:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java | 3 ++-
1 files changed, 2 insertions(+), 1 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 5138225..e61363b 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
@@ -229,7 +229,7 @@
@Select("SELECT \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(DISTINCT case when u.is_partymember=1 then u.user_id else null end )partymemberUser,\n" +
+ " (select count(id) from com_pb_member cpm where cpm.audit_result = 1 and cpm.community_id = #{communityId}) partymemberUser,\n" +
"COUNT(h.id)house\n" +
"FROM\n" +
"sys_user u\n" +
@@ -353,6 +353,7 @@
" card_photo_front = #{userArchivesVO.cardPhotoFront} \n" +
", card_photo_back = #{userArchivesVO.cardPhotoBack} \n" +
",family_book = #{userArchivesVO.familyBook} \n" +
+ ",job = #{userArchivesVO.job} \n" +
" where user_id = #{userArchivesVO.userId}")
void updateUserArchives(@Param("userArchivesVO") UpdateUserArchivesVO userArchivesVO);
--
Gitblit v1.7.1