From a12e09a5bc73672dcd4665d35a1ef8c9d1c534b0 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期一, 16 十月 2023 18:47:11 +0800
Subject: [PATCH] 修改三说会堂
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java | 88 +++++++++++++++++++++++++++++++++++++------
1 files changed, 75 insertions(+), 13 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 a580299..484bdde 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
@@ -343,6 +343,7 @@
if (nonNull(sysUserDO.getStreetId())){
loginUserInfoVO.setStreetId(sysUserDO.getStreetId());
}
+ loginUserInfoVO.setLoveIntegral(sysUserDO.getLoveIntegral());
loginUserInfoVO.setUserId(sysUserDO.getUserId());
loginUserInfoVO.setName(sysUserDO.getName());
loginUserInfoVO.setPassword(sysUserDO.getPassword());
@@ -405,6 +406,7 @@
}
LoginUserInfoVO loginUserInfoVO = new LoginUserInfoVO();
BeanUtils.copyProperties(sysUserDO, loginUserInfoVO);
+ loginUserInfoVO.setLoveIntegral(sysUserDO.getLoveIntegral());
List<SysRoleDO> roleDOList = roleDAO.selectByUserId(sysUserDO.getUserId());
Set<String> set = new HashSet<>();
if (!ObjectUtils.isEmpty(roleDOList)) {
@@ -800,12 +802,14 @@
* @return 人员详情
*/
@Override
- public R<LoginUserInfoVO> detailUser(Long userId) {
+ public R<LoginUserInfoVO> detailUser(Long userId)
+ {
LoginUserInfoVO loginUserInfoVO = new LoginUserInfoVO();
SysUserDO sysUserDO = userDao.selectById(userId);
if (ObjectUtils.isEmpty(sysUserDO)) {
return R.fail("人员不存在");
}
+
BeanUtils.copyProperties(sysUserDO, loginUserInfoVO);
List<ComMngFamilyInfoDO> comMngFamilyInfoDOS = comMngFamilyInfoDAO
.selectList(new QueryWrapper<ComMngFamilyInfoDO>().lambda().eq(ComMngFamilyInfoDO::getUserId, userId));
@@ -896,8 +900,10 @@
SysUserRoleDO sysUserRoleDO=sysUserRoleDAO.selectOne(new QueryWrapper<SysUserRoleDO>()
.lambda().eq(SysUserRoleDO::getUserId,sysUserDO.getUserId()));
- loginUserInfoVO.setRoleId(sysUserRoleDO.getRoleId().toString());
-
+ if(sysUserRoleDO!=null )
+ {
+ loginUserInfoVO.setRoleId(sysUserRoleDO.getRoleId()+"");
+ }
return R.ok(loginUserInfoVO);
}
@@ -1297,11 +1303,29 @@
}
sysRoleDO.setRoleSort(0);
sysRoleDO.setCreateBy(administratorsUserVO.getUserId());
- int insert = roleDAO.insert(sysRoleDO);
- if (insert > 0) {
- SysRoleDO sysRoleDO1 = roleDAO.selectOne(
- new QueryWrapper<SysRoleDO>().lambda().eq(SysRoleDO::getRoleKey, sysRoleDO.getRoleKey()));
- roleId = sysRoleDO1.getRoleId();
+ sysRoleDO.setRoleId(Snowflake.getId());
+
+ SysRoleDO sysRoleDOSelext = roleDAO.selectOne(
+ new QueryWrapper<SysRoleDO>().lambda().eq(SysRoleDO::getRoleKey, sysRoleDO.getRoleKey()));
+
+ if(sysRoleDOSelext==null)
+ {
+ int insert = roleDAO.insert(sysRoleDO);
+ if (insert > 0) {
+ SysRoleDO sysRoleDO1 = roleDAO.selectOne(
+ new QueryWrapper<SysRoleDO>().lambda().eq(SysRoleDO::getRoleId, sysRoleDO.getRoleId()));
+ roleId = sysRoleDO1.getRoleId();
+ // 新角色设置所有权限
+ MenuRoleVO menuRoleVO = new MenuRoleVO();
+ menuRoleVO.setIsAll(1);
+ menuRoleVO.setCommunityId(communityId);
+ menuRoleVO.setRoleId(roleId);
+ this.putMenuRole(menuRoleVO);
+ }
+ }
+ else
+ {
+ roleId = sysRoleDOSelext.getRoleId();
// 新角色设置所有权限
MenuRoleVO menuRoleVO = new MenuRoleVO();
menuRoleVO.setIsAll(1);
@@ -1309,6 +1333,7 @@
menuRoleVO.setRoleId(roleId);
this.putMenuRole(menuRoleVO);
}
+
}
if (roleId.intValue() == 777777777) {
SysRoleDO sysRoleDO = new SysRoleDO();
@@ -1316,11 +1341,47 @@
sysRoleDO.setRoleKey(Constants.STREET_ROLE_KEY + administratorsUserVO.getStreetId());
sysRoleDO.setRoleSort(0);
sysRoleDO.setCreateBy(administratorsUserVO.getUserId());
- int insert = roleDAO.insert(sysRoleDO);
- if (insert > 0) {
- SysRoleDO sysRoleDO1 = roleDAO.selectOne(
- new QueryWrapper<SysRoleDO>().lambda().eq(SysRoleDO::getRoleKey, sysRoleDO.getRoleKey()));
- roleId = sysRoleDO1.getRoleId();
+ sysRoleDO.setRoleId(Snowflake.getId());
+
+ SysRoleDO sysRoleDOSelext = roleDAO.selectOne(
+ new QueryWrapper<SysRoleDO>().lambda().eq(SysRoleDO::getRoleKey, sysRoleDO.getRoleKey()));
+
+ if(sysRoleDOSelext==null)
+ {
+ int insert = roleDAO.insert(sysRoleDO);
+ if (insert > 0) {
+ SysRoleDO sysRoleDO1 = roleDAO.selectOne(
+ new QueryWrapper<SysRoleDO>().lambda().eq(SysRoleDO::getRoleId, sysRoleDO.getRoleId()));
+ roleId = sysRoleDO1.getRoleId();
+ // 新街道管理员角色设置固定三社权限
+ MenuRoleVO menuRoleVO = new MenuRoleVO();
+ List<Long> menu = new ArrayList<>();
+ if (administratorsUserVO.getSocialType() == 1) {
+ menu.add(233L);
+ menu.add(234L);
+ menu.add(235L);
+ menu.add(236L);
+ menu.add(237L);
+ } else if (administratorsUserVO.getSocialType() == 2) {
+ menu.add(233L);
+ menu.add(234L);
+ menu.add(236L);
+ menu.add(237L);
+ menu.add(238L);
+ } else if (administratorsUserVO.getSocialType() == 3) {
+ menu.add(233L);
+ menu.add(237L);
+ } else {
+ menuRoleVO.setIsAll(1);
+ }
+ menuRoleVO.setMenuIds(menu);
+ menuRoleVO.setRoleId(roleId);
+ this.putMenuRole(menuRoleVO);
+ }
+ }
+ else
+ {
+ roleId = sysRoleDOSelext.getRoleId();
// 新街道管理员角色设置固定三社权限
MenuRoleVO menuRoleVO = new MenuRoleVO();
List<Long> menu = new ArrayList<>();
@@ -1346,6 +1407,7 @@
menuRoleVO.setRoleId(roleId);
this.putMenuRole(menuRoleVO);
}
+
}
SysRoleDO roleDO = roleDAO.selectById(roleId);
if (ObjectUtils.isEmpty(roleDO)) {
--
Gitblit v1.7.1