From f2ec79bd7ace97a9a3ee7d09788f2070ba0b95dc Mon Sep 17 00:00:00 2001 From: pengjie <17373303529@163.com> Date: Tue, 21 Nov 2023 18:35:57 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../government/GovSystemRoleController.java | 18 +++++++++++++++++ .../service/impl/BaseMenuServiceImpl.java | 12 ++++++----- .../service/impl/EnterpriseServiceImpl.java | 20 +++++++++---------- .../service/impl/SystemRoleServiceImpl.java | 4 +++- .../service/impl/SystemUserServiceImpl.java | 6 +++--- src/main/resources/application-dev.properties | 6 +++--- 6 files changed, 44 insertions(+), 22 deletions(-) diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovSystemRoleController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovSystemRoleController.java index e321eb6..63ed021 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovSystemRoleController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovSystemRoleController.java @@ -172,8 +172,26 @@ public class GovSystemRoleController { @PostMapping(value = "/editMenu") public Result menu(@RequestBody List systemRoleMenus) { Result result = new Result(); + if (systemRoleMenus.size() == 0) { + result.error("请选择菜单权限"); + return result; + } + SystemRole systemRole = systemRoleService.getById(systemRoleMenus.get(0).getRoleId()); systemRoleMenuService.remove(Wrappers.lambdaQuery() .eq(SystemRoleMenu::getRoleId, systemRoleMenus.get(0).getRoleId())); + Long moduleId; + if (systemRole.getRoleType() == 2) { + moduleId = 1670639811581595650L; + } else if (systemRole.getRoleType() == 3) { + moduleId = 1681837103227502594L; + } else { + moduleId = 1670603312504918018L; + } + SystemRoleMenu systemRoleMenu = new SystemRoleMenu(); + systemRoleMenu.setRoleId(systemRoleMenus.get(0).getRoleId()); + systemRoleMenu.setType(0); + systemRoleMenu.setAuthorityId(moduleId); + systemRoleMenus.add(systemRoleMenu); systemRoleMenuService.saveBatch(systemRoleMenus); return result; } diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/BaseMenuServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/BaseMenuServiceImpl.java index fb6c6d3..12dfe93 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/BaseMenuServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/BaseMenuServiceImpl.java @@ -192,6 +192,7 @@ public class BaseMenuServiceImpl extends ServiceImpl i @Override public List getMenusForHz(Map map) { + SecurityUser user = SecurityUtil.getUser(); String roleId = MapUtils.getString(map, "roleId"); SystemRole systemRole = systemRoleService.getById(roleId); Integer accountType = systemRole.getRoleType(); @@ -218,13 +219,14 @@ public class BaseMenuServiceImpl extends ServiceImpl i } else { moduleId = 1670603312504918018L; } - List baseModules = baseModuleService.list(Wrappers.lambdaQuery().eq(BaseModule::getModuleId, moduleId)); - List menuList = TreeUtil.formatModule(baseModules); +// List baseModules = baseModuleService.list(Wrappers.lambdaQuery().eq(BaseModule::getModuleId, moduleId)); +// List menuList = TreeUtil.formatModule(baseModules); + List menuList = new ArrayList<>(); Set baseMenus = new HashSet<>(); List baseMenuList = new ArrayList<>(); - if (accountType != 3) { + if (accountType != 3 || (user.getAccountType() == 2 && systemRole.getSysDefault() == 1)) { // 查询相对应的菜单 - List res = baseMenuMapper.selectList(Wrappers.lambdaQuery().in(BaseMenu::getModuleId, moduleId) + List res = baseMenuMapper.selectList(Wrappers.lambdaQuery().eq(BaseMenu::getModuleId, moduleId) .eq(BaseMenu::getStatus, 1).orderByAsc(BaseMenu::getPriority)); baseMenus.addAll(res); } else { @@ -251,7 +253,7 @@ public class BaseMenuServiceImpl extends ServiceImpl i List baseAction = baseActionMapper.selectList(Wrappers.lambdaQuery().in(BaseAction::getMenuId, baseMenus.stream().map(m -> m.getMenuId()).collect(Collectors.toList())).eq(BaseAction::getStatus, 1)); menuList.addAll(TreeUtil.formatAction(baseAction)); - return TreeUtil.build(menuList, 0, moduleId, 1); + return TreeUtil.build(menuList, 1, moduleId, 2); } @Override diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/EnterpriseServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/EnterpriseServiceImpl.java index 528b97f..4bfdf73 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/EnterpriseServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/EnterpriseServiceImpl.java @@ -7,12 +7,12 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.zhgd.jeecg.common.util.PageUtil; -import com.zhgd.mybatis.Aes; import com.zhgd.xmgl.modules.basicdata.entity.*; import com.zhgd.xmgl.modules.basicdata.mapper.EnterpriseMapper; import com.zhgd.xmgl.modules.basicdata.mapper.ProjectMapper; import com.zhgd.xmgl.modules.basicdata.service.*; import com.zhgd.xmgl.modules.basicdata.vo.EnterpriseVo; +import com.zhgd.xmgl.modules.basicdata.vo.SystemUserVo; import com.zhgd.xmgl.security.SecurityUtil; import com.zhgd.xmgl.util.CommonUtil; import com.zhgd.xmgl.util.ParamEnum; @@ -98,9 +98,8 @@ public class EnterpriseServiceImpl extends ServiceImpllambdaQuery().eq(SystemRole::getRoleCode, type.name())); + SystemRole role = systemRoleService.getOne(Wrappers.lambdaQuery().eq(SystemRole::getRoleCode, type.name()) + .eq(SystemRole::getSysDefault, 1)); if (role != null) { - SystemUserRole systemUserRole = new SystemUserRole(); - systemUserRole.setUserId(systemUser.getUserId()); - systemUserRole.setRoleId(role.getRoleId()); - systemUserRoleService.save(systemUserRole); + systemUser.setRoleId(role.getRoleId()); + systemUserService.saveInfo(systemUser); +// SystemUserRole systemUserRole = new SystemUserRole(); +// systemUserRole.setUserId(userId); +// systemUserRole.setRoleId(role.getRoleId()); +// systemUserRoleService.save(systemUserRole); } } } diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemRoleServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemRoleServiceImpl.java index 59693e3..70117c7 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemRoleServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemRoleServiceImpl.java @@ -50,7 +50,9 @@ public class SystemRoleServiceImpl extends ServiceImpl page = PageUtil.getPage(map); return baseMapper.selectPage(page, queryWrapper); diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java index a70c6bd..783d229 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java @@ -100,14 +100,13 @@ public class SystemUserServiceImpl extends ServiceImpl