diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/OrganizeController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/OrganizeController.java index 9dff661..788c757 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/OrganizeController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/OrganizeController.java @@ -59,7 +59,7 @@ public class OrganizeController { return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultObject(organize); } catch (ImppBusiException busExcep) { LOGGER.error(busExcep.getErrorMsg() + ":{}", busExcep.getErrorDetail(), busExcep); - return ResultBean.fail(busExcep.getErrorShow()).build(); + return ResultBean.fail(busExcep).build(); } catch (Exception e) { return ResultBean.fail(e.getMessage()).setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode()); } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysRoleController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysRoleController.java index e0e4399..12d7dfd 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysRoleController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysRoleController.java @@ -50,9 +50,9 @@ public class SysRoleController { //新增初始化 ConvertBean.modelInitialize(role, AuthUtil.getSessionUser()); - role.setRoleStatusId(CommonEnumUtil.DATA_STATUS.ENABLE.getValue()); - role.setRedMenuNumber(0); - role.setRedModuleNumber(0); + role.setRoleStatus(CommonEnumUtil.DATA_STATUS.ENABLE.getValue()); + role.setMenuNumber(0); + role.setModuleNumber(0); role = sysRoleService.insertSysRole(role); return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultObject(role); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/daoimpl/UserPermissionDaoImpl.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/daoimpl/UserPermissionDaoImpl.java index 78491d8..be1b61a 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/daoimpl/UserPermissionDaoImpl.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/daoimpl/UserPermissionDaoImpl.java @@ -8,6 +8,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.persistence.EntityManager; +import java.util.ArrayList; import java.util.List; /** @@ -53,7 +54,16 @@ public class UserPermissionDaoImpl implements IUserPermissionDao { " left join RefRoleMenu as rrm on rrm.roleId = rur.roleId" + " left join SysMenu as sm on sm.id = rrm.menuId" + " where rur.userId =:userId"; - return entityManager.createQuery(hql).setParameter("userId",user.getId()).getResultList(); + List list = entityManager.createQuery(hql).setParameter("userId", user.getId()).getResultList(); + List result = new ArrayList<>(); + if(list != null && list.size() > 0){ + for (SysMenu menu : list) { + if(!result.contains(menu)){ + result.add(menu); + } + } + } + return result; } @Override diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMenuService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMenuService.java index 9f7ebc6..3a834b2 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMenuService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMenuService.java @@ -67,7 +67,7 @@ public class SysMenuService implements ISysMenuService { if (sysMenu.getParentId() != null && sysMenu.getParentId() > 0) { SysMenu parent = sysMenuRDao.getById(sysMenu.getParentId()); ValidatorBean.checkNotNull(parent,"上级权限信息不存在"); - sysMenu.setRedParentName(parent.getName()); + sysMenu.setParentNameRdd(parent.getName()); } sysMenuRDao.update(sysMenu); @@ -152,15 +152,15 @@ public class SysMenuService implements ISysMenuService { if (sysMenu.getParentId() != null && sysMenu.getParentId() > 0) { SysMenu parent = sysMenuRDao.getById(sysMenu.getParentId()); ValidatorBean.checkNotNull(parent,"上级权限信息不存在"); - sysMenu.setRedParentName(parent.getName()); + sysMenu.setParentNameRdd(parent.getName()); } return sysMenuRDao.insert(sysMenu); }else { throw ImppExceptionBuilder.newInstance() .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) .setErrorCode(ImppExceptionEnum.IO_EXCEPTION.getCode()) - .setErrorDetail("角色代码已存在") - .setErrorSolution("请重新输入角色代码") + .setErrorDetail("功能代码已存在") + .setErrorSolution("请重新输入功能代码") .build(); } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysRoleService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysRoleService.java index eda5967..f307647 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysRoleService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysRoleService.java @@ -57,7 +57,7 @@ public class SysRoleService implements ISysRoleService { public void updateSysRoleStatus(String id, int status, SessionUser user) { LOGGER.info("系统角色 SYS_MENU id:{} status:{} user:{}", id,status,user); SysRole role = sysRoleRDao.getById(Long.parseLong(id)); - role.setRoleStatusId(status); + role.setRoleStatus(status); role.setModifyUser(user.getUserName()); sysRoleRDao.update(role); } @@ -162,11 +162,11 @@ public class SysRoleService implements ISysRoleService { // 冗余信息 for (SysRole role : roleList) { - role.setRedModuleNumber(moduleListRdd.size()); - role.setRedModuleNames(String.join(",",moduleListRdd)); + role.setModuleNumber(moduleListRdd.size()); + role.setModuleNamesRdd(String.join(",",moduleListRdd)); - role.setRedMenuNumber(featuresListRdd.size()); - role.setRedMenuNames(String.join(",",featuresListRdd)); + role.setMenuNumber(featuresListRdd.size()); + role.setMenuNamesRdd(String.join(",",featuresListRdd)); } refRoleMenuRDao.saveAll(refs);