From 4d670be37e1f0ff2c6274e531655e2999f61a795 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期三, 28 四月 2021 13:26:47 +0800
Subject: [PATCH] bugfixed:判断 登录用户是否是"管理员"或者 本社区 "社区团队"、"党委成员"

---
 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
index 8a7a01a..4f791ec 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
@@ -230,6 +230,7 @@
         loginUserInfoVO.setIsmemberrole(2);
 //        志愿者状态
         String phone = sysUserDO.getPhone();
+        Long userCommunityId = sysUserDO.getCommunityId();
         if (!ObjectUtils.isEmpty(phone)) {
             ComMngVolunteerMngVO comMngVolunteerMngVO = userDao.selectVolunteerMngByPhone(phone);
             if (ObjectUtils.isEmpty(comMngVolunteerMngVO)) {
@@ -238,8 +239,9 @@
                 int state = comMngVolunteerMngVO.getState().intValue();
                 loginUserInfoVO.setVolunteerStatus(state);
             }
-            Integer countTeam = userDao.selectCountTeam(phone);
-            Integer selectCountMemberRole = userDao.selectCountMemberRole(phone);
+            //是否是"管理员"或者 本社区 "社区团队"、"党委成员"
+            Integer countTeam = userDao.selectCountTeam(phone, userCommunityId);
+            Integer selectCountMemberRole = userDao.selectCountMemberRole(phone, userCommunityId);
             Integer isSysUser = userDao.selectCountSysUser(phone);
             if (countTeam != null && countTeam > 0) {
                 loginUserInfoVO.setIsmemberrole(1);

--
Gitblit v1.7.1