From 601c0daae895c0d95ae05df46e2d07562c83b863 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期五, 22 十月 2021 14:09:12 +0800
Subject: [PATCH] 河门口功能开发

---
 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java |    6 +++---
 1 files changed, 3 insertions(+), 3 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 7a6bb82..ef8a8b3 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
@@ -1163,7 +1163,7 @@
                 menu.add(238L);
             }
             else if(administratorsUserVO.getSocialType()==3){
-                sysRoleDO.setRoleKey("social_org" + administratorsUserVO.getStreetId());
+                sysRoleDO.setRoleKey("social_org_member" + administratorsUserVO.getStreetId());
                 menu.add(233L);
                 menu.add(237L);
             }
@@ -1174,15 +1174,15 @@
                     new QueryWrapper<SysRoleDO>().lambda().eq(SysRoleDO::getRoleKey, sysRoleDO.getRoleKey()));
             if(sysRoleDO1!=null){
                 sysRoleDO=sysRoleDO1;
+                roleId = sysRoleDO.getRoleId();
             }else{
                 roleDAO.insert(sysRoleDO);
-            }
-                roleId = sysRoleDO.getRoleId();
                 // 新街道管理员角色设置固定三社权限
                 MenuRoleVO menuRoleVO = new MenuRoleVO();
                 menuRoleVO.setMenuIds(menu);
                 menuRoleVO.setRoleId(roleId);
                 this.putMenuRole(menuRoleVO);
+            }
         }
         SysRoleDO roleDO = roleDAO.selectById(roleId);
         if (ObjectUtils.isEmpty(roleDO)) {

--
Gitblit v1.7.1