From ac6bcb6bff012f660f27968e511f394383759000 Mon Sep 17 00:00:00 2001
From: jhjang <jhjang@maprex.co.kr>
Date: 수, 03 11월 2021 16:36:18 +0900
Subject: [PATCH] - 관리자 가져오는 함수 수정 => 기존 : 퍼미션이 2046인 사용자를 가져옴 => 수정 : 퍼미션을 파라미터로 입력한 사용자를 가져옴
---
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/repository/UserRepository.java | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
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 760b213..da3bca6 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;
@@ -1068,7 +1069,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