충돌

이민희

2021-11-03 551e7988ee010d6799731ccaf64060621e995608

충돌

 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"; // 사용자 등급 정보를 수정할수 없습니다.

}

 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);
}

 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());
    }

    //  해당 사용자가 관리하는 업무 공간을 마지막으로 접근한 업무 공간 정보로 업데이트한다.

 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>