From c24bd91b480d8d87844e795ce11c759ea1e6be98 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期二, 22 二月 2022 16:53:14 +0800
Subject: [PATCH] 三社功能提交
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java | 52 ++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 38 insertions(+), 14 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 28590d1..b31c903 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
@@ -358,6 +358,7 @@
loginUserInfoVO.setIsFourMember(2);
loginUserInfoVO.setIsCommunityWorker(2);
loginUserInfoVO.setIsPropertyWorker(2);
+ loginUserInfoVO.setIsSocialWorker(2);
// 志愿者状态
String phone = sysUserDO.getPhone();
Long userCommunityId = sysUserDO.getCommunityId();
@@ -396,6 +397,10 @@
loginUserInfoVO.setIsmemberrole(1);
} else if (isSysUser != null && isSysUser > 0) {
loginUserInfoVO.setIsmemberrole(1);
+ }
+ Integer countSocialWorker = userDao.countSocialWorker(phone,userCommunityId);
+ if(countSocialWorker>0){
+ loginUserInfoVO.setIsSocialWorker(1);
}
}
loginUserInfoVO.setIsRealNamed(sysUserDO.getIdCard() != null);
@@ -681,6 +686,19 @@
loginUserInfoVO.setIsPropertyWorker(countPropertyWorker > 0 ? 1 : 0);
loginUserInfoVO.setIdCard(SensitiveUtil.desensitizedIdNumber(loginUserInfoVO.getIdCard()));
loginUserInfoVO.setPhone(SensitiveUtil.desensitizedPhoneNumber(loginUserInfoVO.getPhone()));
+ //判断账号类型
+ int countSocialOrg=userDao.countSocialOrg(userId);
+ if(countSocialOrg>0){
+ loginUserInfoVO.setUserType(3);
+ }
+ else {
+ if(loginUserInfoVO.getStreetId()!=null){
+ loginUserInfoVO.setUserType(1);
+ }
+ else {
+ loginUserInfoVO.setUserType(2);
+ }
+ }
return R.ok(loginUserInfoVO);
}
@@ -1189,25 +1207,23 @@
List<Long> menu=new ArrayList<>();
if(administratorsUserVO.getSocialType()==1){
sysRoleDO.setRoleKey(Constants.STREET_ROLE_KEY + administratorsUserVO.getStreetId());
- menu.add(233L);
- menu.add(234L);
- menu.add(235L);
- menu.add(236L);
- menu.add(237L);
+ menu.add(300L);
+ menu.add(301L);
+ menu.add(302L);
+ menu.add(303L);
+ menu.add(304L);
}
else if(administratorsUserVO.getSocialType()==2){
sysRoleDO.setRoleKey("social_org" + administratorsUserVO.getStreetId());
- menu.add(233L);
- menu.add(76L);
- menu.add(234L);
- menu.add(236L);
- menu.add(237L);
- menu.add(238L);
+ menu.add(300L);
+ menu.add(301L);
+ menu.add(302L);
+ menu.add(303L);
}
else if(administratorsUserVO.getSocialType()==3){
sysRoleDO.setRoleKey("social_org_member" + administratorsUserVO.getStreetId());
- menu.add(233L);
- menu.add(237L);
+ menu.add(300L);
+ menu.add(303L);
}
sysRoleDO.setRoleSort(0);
@@ -1222,7 +1238,7 @@
// 新街道管理员角色设置固定三社权限
MenuRoleVO menuRoleVO = new MenuRoleVO();
menuRoleVO.setMenuIds(menu);
- menuRoleVO.setRoleId(roleId);
+ menuRoleVO.setRoleId(sysRoleDO.getRoleId());
this.putMenuRole(menuRoleVO);
}
}
@@ -2886,4 +2902,12 @@
BeanUtils.copyProperties(sysUserDO, loginUserInfoVO);
return R.ok(loginUserInfoVO);
}
+
+ @Override
+ public R updateStreetId(AdministratorsUserVO administratorsUserVO) {
+ SysUserDO sysUserDO=new SysUserDO();
+ BeanUtils.copyProperties(administratorsUserVO,sysUserDO);
+ userDao.updateById(sysUserDO);
+ return R.ok();
+ }
}
--
Gitblit v1.7.1