From 551e7988ee010d6799731ccaf64060621e995608 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 수, 03 11월 2021 18:09:12 +0900
Subject: [PATCH] 충돌
---
src/main/java/kr/wisestone/owl/service/impl/UserServiceImpl.java | 3 ++-
src/main/resources/META-INF/orm.xml | 3 +--
src/main/java/kr/wisestone/owl/constant/MsgConstants.java | 2 ++
src/main/java/kr/wisestone/owl/repository/UserRepository.java | 2 +-
4 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/constant/MsgConstants.java b/src/main/java/kr/wisestone/owl/constant/MsgConstants.java
index 0136cc5..d8e0a84 100644
--- a/src/main/java/kr/wisestone/owl/constant/MsgConstants.java
+++ b/src/main/java/kr/wisestone/owl/constant/MsgConstants.java
@@ -205,5 +205,7 @@
public static final String PAGE_SIZE_NEGATIVE_OR_NULL = "PAGE_SIZE_NEGATIVE_OR_NULL"; // �슂泥��븳 �럹�씠吏� �겕湲곌� �옒紐삳릺�뿀�뒿�땲�떎.
public static final String USER_LEVEL_ALREADY_IN_USE = "USER_LEVEL_ALREADY_IN_USE"; // �궗�슜�옄 �벑湲됱쓣 �궗�슜�븯怨� �엳�뒗 �궗�슜�옄媛� �엳�뒿�땲�떎.
+ public static final String USER_LEVEL_ALREADY = "USER_LEVEL_ALREADY"; // �궗�슜�옄 �벑湲됱쓣 �궗�슜�븯怨� �엳�뒗 �궗�슜�옄媛� �엳�뒿�땲�떎.
+ public static final String USER_LEVEL_PERMISSION_DENIED = "USER_LEVEL_PERMISSION_DENIED"; // �궗�슜�옄 �벑湲� �젙蹂대�� �닔�젙�븷�닔 �뾾�뒿�땲�떎.
}
diff --git a/src/main/java/kr/wisestone/owl/repository/UserRepository.java b/src/main/java/kr/wisestone/owl/repository/UserRepository.java
index 2176ccc..8ff50a7 100644
--- a/src/main/java/kr/wisestone/owl/repository/UserRepository.java
+++ b/src/main/java/kr/wisestone/owl/repository/UserRepository.java
@@ -28,5 +28,5 @@
List<User> findJoinDay(@Param("todayFrom") Date todayFrom, @Param("todayTo") Date todayTo);
@Query(name = "User.findAdmin")
- List<User> findAdmin();
+ List<User> findAdmin(@Param("permission") Integer permission);
}
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 2d009dd..f8566be 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/UserServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/UserServiceImpl.java
@@ -42,6 +42,7 @@
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.servlet.ModelAndView;
+import javax.rmi.CORBA.Util;
import javax.servlet.http.HttpServletRequest;
import java.io.*;
import java.net.HttpURLConnection;
@@ -1069,7 +1070,7 @@
@Override
@Transactional(readOnly = true)
public List<User> findAdmin() {
- return this.userRepository.findAdmin();
+ return this.userRepository.findAdmin(MngPermission.makeAllPermission());
}
// �빐�떦 �궗�슜�옄媛� 愿�由ы븯�뒗 �뾽臾� 怨듦컙�쓣 留덉�留됱쑝濡� �젒洹쇳븳 �뾽臾� 怨듦컙 �젙蹂대줈 �뾽�뜲�씠�듃�븳�떎.
diff --git a/src/main/resources/META-INF/orm.xml b/src/main/resources/META-INF/orm.xml
index 6a31acf..5f64381 100644
--- a/src/main/resources/META-INF/orm.xml
+++ b/src/main/resources/META-INF/orm.xml
@@ -43,8 +43,7 @@
SELECT u
FROM User u
INNER JOIN u.userLevel ul
- INNER JOIN u.departmentManagement dm
- WHERE ul.permission > 2047
+ WHERE ul.permission >= ?1
AND u.status = '01'
</query>
</named-query>
--
Gitblit v1.8.0