diff --git a/egovframe-template-simple-react-contribution/src/pages/admin/users/UserInfoModal.jsx b/egovframe-template-simple-react-contribution/src/pages/admin/users/UserInfoModal.jsx
index 2d54780..2623395 100644
--- a/egovframe-template-simple-react-contribution/src/pages/admin/users/UserInfoModal.jsx
+++ b/egovframe-template-simple-react-contribution/src/pages/admin/users/UserInfoModal.jsx
@@ -139,7 +139,8 @@ function UserInfoModal({savedInfo, reloadFunction}){
사용자 권한
-
+ {/**/}
+
diff --git a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/config/entity/TcMenu.java b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/config/entity/TcMenu.java
index d910167..4db653f 100644
--- a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/config/entity/TcMenu.java
+++ b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/config/entity/TcMenu.java
@@ -64,7 +64,7 @@ public class TcMenu {
private String menuAuth;
@Transient
- private List roleList;
+ private String role;
@Transient
private List childList;
diff --git a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/config/service/AdminConfigService.java b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/config/service/AdminConfigService.java
index dad96f7..d212daa 100644
--- a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/config/service/AdminConfigService.java
+++ b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/config/service/AdminConfigService.java
@@ -163,10 +163,10 @@ public class AdminConfigService extends EgovAbstractServiceImpl {
}
- public List selectMenuListToRole(String menuTypeCd, List roleList){
+ public List selectMenuListToRole(String menuTypeCd, String role){
TcMenu params = new TcMenu();
params.setMenuTypeCd(menuTypeCd);
- params.setRoleList(roleList);
+ params.setRole(role);
return menuMapper.selectMenuListToRole(params);
}
diff --git a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/leftNav/LeftNavController.java b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/leftNav/LeftNavController.java
index 50ef3d3..92785fe 100644
--- a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/leftNav/LeftNavController.java
+++ b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/leftNav/LeftNavController.java
@@ -3,6 +3,7 @@ package com.dbnt.kcscbackend.admin.leftNav;
import com.dbnt.kcscbackend.admin.config.entity.TcMenu;
import com.dbnt.kcscbackend.admin.config.service.AdminConfigService;
+import com.dbnt.kcscbackend.admin.users.service.AdminUsersService;
import com.dbnt.kcscbackend.auth.entity.LoginVO;
import com.dbnt.kcscbackend.config.common.ResultVO;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -22,6 +23,7 @@ import java.util.*;
public class LeftNavController {
private final AdminConfigService adminConfigService;
+ private final AdminUsersService adminUsersService;
@RequestMapping(method = RequestMethod.GET, value = "/menu")
public ResultVO getMenu(
@@ -29,7 +31,8 @@ public class LeftNavController {
@RequestParam(value="menuType", required = true) String menuTypeCd
){
ResultVO resultVO = new ResultVO();
- List menuList = adminConfigService.selectMenuListToRole(menuTypeCd, Arrays.asList(user.getUserRole().split(",")));
+ String userRole = adminUsersService.selectUserInfo(user.getUserSeq()).getUserRole();
+ List menuList = adminConfigService.selectMenuListToRole(menuTypeCd, userRole);
Map groupMap = new LinkedHashMap<>();
for(TcMenu menu: menuList){
groupMap.put(menu.getMenuGroup(), menu.getGroupTitle());
diff --git a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/config/jwt/EgovJwtTokenUtil.java b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/config/jwt/EgovJwtTokenUtil.java
index 84ee52f..6e168f7 100644
--- a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/config/jwt/EgovJwtTokenUtil.java
+++ b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/config/jwt/EgovJwtTokenUtil.java
@@ -70,14 +70,6 @@ public class EgovJwtTokenUtil implements Serializable{
Claims claims = getClaimFromToken(token);
return claims.get("userSe").toString();
}
- public String getUserRoleFromToken(String token) {
- Claims claims = getClaimFromToken(token);
- return claims.get("userRole").toString();
- }
- public String getInfoFromToken(String type, String token) {
- Claims claims = getClaimFromToken(token);
- return claims.get(type).toString();
- }
public Claims getClaimFromToken(String token) {
return getAllClaimsFromToken(token);
}
@@ -101,7 +93,6 @@ public class EgovJwtTokenUtil implements Serializable{
claims.put("id", loginVO.getUserId());
claims.put("remoteAddr", remoteAddr);
claims.put("userSe", loginVO.getUserSe());
- claims.put("userRole", loginVO.getUserRole());
claims.put("type", "Authorization");
log.debug("===>>> secret = "+SECRET_KEY);
diff --git a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/config/jwt/JwtAuthenticationFilter.java b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/config/jwt/JwtAuthenticationFilter.java
index 54db30c..83cc8bd 100644
--- a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/config/jwt/JwtAuthenticationFilter.java
+++ b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/config/jwt/JwtAuthenticationFilter.java
@@ -70,10 +70,6 @@ public class JwtAuthenticationFilter extends OncePerRequestFilter {
loginVO.setUserSeq(Integer.parseInt(jwtTokenUtil.getUserSeqFromToken(jwtToken)));
loginVO.setId(id);
loginVO.setUserSe(jwtTokenUtil.getUserSeFromToken(jwtToken));
- loginVO.setUserRole(jwtTokenUtil.getUserRoleFromToken(jwtToken));
-// loginVO.setUniqId( jwtTokenUtil.getInfoFromToken("uniqId",jwtToken) );
-// loginVO.setOrgnztId( jwtTokenUtil.getInfoFromToken("orgnztId",jwtToken) );
-// loginVO.setName( jwtTokenUtil.getInfoFromToken("name",jwtToken) );
UsernamePasswordAuthenticationToken authentication = new UsernamePasswordAuthenticationToken(loginVO, null,
Arrays.asList(new SimpleGrantedAuthority("ROLE_USER"))
diff --git a/kcsc-back-end/src/main/resources/mybatisMapper/TcMenuMapper.xml b/kcsc-back-end/src/main/resources/mybatisMapper/TcMenuMapper.xml
index 10f07ee..351a07d 100644
--- a/kcsc-back-end/src/main/resources/mybatisMapper/TcMenuMapper.xml
+++ b/kcsc-back-end/src/main/resources/mybatisMapper/TcMenuMapper.xml
@@ -51,10 +51,7 @@
inner join (
select menu_id , string_agg(role_id, ',') as role_cd
from tb_menu_role
- where role_id in
-
- #{role}
-
+ where role_id = #{role}
group by menu_id
) b on a.menu_id = b.menu_id
inner join tc_menu c on a.menu_group = c.menu_id