From ec192c9a7385ce426a4340506b90acd78d9700aa Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期五, 02 四月 2021 16:10:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java | 8 ++++----
1 files changed, 4 insertions(+), 4 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 98eef13..e30a69d 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
@@ -741,7 +741,7 @@
Long roleId = administratorsUserVO.getRoleId();
Long communityId = administratorsUserVO.getCommunityId();
if (roleId.intValue()==999999999) {
-//新增社区高级管理员角色
+ //新增社区高级管理员角色
SysRoleDO sysRoleDO=new SysRoleDO();
sysRoleDO.setCommunityId(communityId);
sysRoleDO.setRoleName("超级管理员");
@@ -752,7 +752,7 @@
if (insert>0) {
SysRoleDO sysRoleDO1 = roleDAO.selectOne(new QueryWrapper<SysRoleDO>().lambda().eq(SysRoleDO::getRoleKey, sysRoleDO.getRoleKey()));
roleId=sysRoleDO1.getRoleId();
-// 新角色设置所有权限
+ //新角色设置所有权限
MenuRoleVO menuRoleVO=new MenuRoleVO();
menuRoleVO.setIsAll(1);
menuRoleVO.setCommunityId(communityId);
@@ -781,7 +781,7 @@
}
if (insert>0) {
- SysUserDO sysUserDO1 = userDao.selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getType, administratorsUserVO.getType()).eq(SysUserDO::getPhone, administratorsUserVO.getPhone()));
+ SysUserDO sysUserDO1 = userDao.selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getType, administratorsUserVO.getType()).eq(SysUserDO::getAccount, administratorsUserVO.getAccount()));
Long userId = sysUserDO1.getUserId();
SysUserRoleDO sysUserRoleDO=new SysUserRoleDO();
sysUserRoleDO.setUserId(userId);
@@ -1542,7 +1542,7 @@
@Override
public R listTags(Long communityId) {
List<String> list=new ArrayList<>();
- List<ComMngUserTagDO> comMngUserTagDOS = comMngUserTagDAO.selectList(new QueryWrapper<ComMngUserTagDO>().eq("sysFlag",1).or().eq("communityId",communityId));
+ List<ComMngUserTagDO> comMngUserTagDOS = comMngUserTagDAO.selectList(new QueryWrapper<ComMngUserTagDO>().eq("sys_flag",1).or().eq("community_id",communityId));
if (!ObjectUtils.isEmpty(comMngUserTagDOS)) {
list=comMngUserTagDOS.stream().map(comMngUserTagDO -> comMngUserTagDO.getTagName()).collect(Collectors.toList());
}
--
Gitblit v1.7.1