From b3c6911c1e78563dc04998dd7bfb510130a9fcec Mon Sep 17 00:00:00 2001
From: huanghongfa <18228131219@163.com>
Date: 星期一, 01 二月 2021 16:37:52 +0800
Subject: [PATCH] auth

---
 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 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 1694453..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
@@ -9,6 +9,7 @@
 import com.panzhihua.common.model.vos.IndexDataKanbanVO;
 import com.panzhihua.common.model.vos.IndexDataVO;
 import com.panzhihua.common.model.vos.LoginUserInfoVO;
+import com.panzhihua.common.model.vos.community.ComActVO;
 import com.panzhihua.common.model.vos.community.ComMngVolunteerMngVO;
 import com.panzhihua.common.model.vos.user.AdministratorsUserVO;
 import com.panzhihua.common.model.vos.user.SysUserNoticeVO;
@@ -58,7 +59,7 @@
             "<if test='loginUserInfoVO.communityName != null and loginUserInfoVO.communityName.trim() != &quot;&quot;'>" +
             "AND c.`area_name` like concat(#{loginUserInfoVO.communityName},'%')  \n" +
             " </if> " +
-            " where u.face_state is not null and u.type=1" +
+            " where u.face_state is not null and u.type=1 and u.community_id=#{loginUserInfoVO.communityId} " +
             "<if test='loginUserInfoVO.name != null and loginUserInfoVO.name.trim() != &quot;&quot;'>" +
             "and u.`name` like concat(#{loginUserInfoVO.name},'%')  \n" +
             " </if> " +
@@ -91,14 +92,13 @@
             "<if test='loginUserInfoVO.communityName != null and loginUserInfoVO.communityName.trim() != &quot;&quot;'>" +
             "AND c.`area_name` like concat(#{loginUserInfoVO.communityName},'%')  \n" +
             " </if> " +
-            " <where>" +
+            " where u.community_id=#{loginUserInfoVO.communityId} and u.type=1 " +
             "<if test='loginUserInfoVO.name != null and loginUserInfoVO.name.trim() != &quot;&quot;'>" +
             " and u.`name` like concat(#{loginUserInfoVO.name},'%')  \n" +
             " </if> " +
             "<if test='loginUserInfoVO.phone != null and loginUserInfoVO.phone.trim() != &quot;&quot;'>" +
             "AND u.phone like concat(#{loginUserInfoVO.phone},'%') " +
             " </if> " +
-            " </where>" +
             "</script>")
     IPage<LoginUserInfoVO> pageUser(Page page, @Param("loginUserInfoVO") LoginUserInfoVO loginUserInfoVO);
 
@@ -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" +
@@ -239,8 +239,10 @@
             "u.continuous_landing_days + 1,\n" +
             "0)")
     int timedTaskContinuousLandingDays();
-    @Select("select state from com_mng_volunteer_mng where phone=#{phone}")
+    @Select("select state from com_mng_volunteer_mng where phone=#{phone} order by create_at desc limit 1")
     ComMngVolunteerMngVO selectVolunteerMngByPhone(String phone);
     @Update("update sys_user set face_state=null where user_id=#{userId}")
     int updateFaceState(Long userId);
+    @Select("select name from com_act where community_id=#{communityId}")
+    ComActVO selectCommunity(Long communityId);
 }

--
Gitblit v1.7.1