From 6a8cacfc31f8ac932844a122940fdfd127c117ac Mon Sep 17 00:00:00 2001
From: 박지현 <jhpark@maprex.co.kr>
Date: 수, 09 2월 2022 09:17:20 +0900
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/kr/wisestone/owl/service/impl/UserServiceImpl.java | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/service/impl/UserServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/UserServiceImpl.java
index 4387606..721537c 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/UserServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/UserServiceImpl.java
@@ -1244,9 +1244,8 @@
@Transactional(readOnly = true)
public User getUserSession(Map<String, Object> resJsonData, HttpServletRequest httpServletRequest) {
User user = this.getUser(this.webAppUtil.getLoginId());
- UserVo userVo = ConvertUtil.copyProperties(user, UserVo.class, "password","permission");
+ UserVo userVo = ConvertUtil.copyProperties(user, UserVo.class, "password");
// user�뿉�꽌 Permission 媛믪쓣 媛��졇���꽌 userVo �뿉 setPermission �븿
- userVo.setPermission(user.getPermission());
userVo.setAccount(CommonUtil.decryptAES128(userVo.getAccount()));
UserLevel userLevel = user.getUserLevel();
--
Gitblit v1.8.0