DBNT
/
FAISP
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

관리자 메뉴에서 비외사사용자 표현 오류 수정.

master
강석 최 2023-04-05 13:50:00 +09:00
parent bc2d6b0113
commit 17ad411b38
5 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/dbnt/faisp/config/BaseController.java
View File

@ -46,7 +46,7 @@ public class BaseController {
public ModelAndView loginCheck(@AuthenticationPrincipal UserInfo loginUser) { public ModelAndView loginCheck(@AuthenticationPrincipal UserInfo loginUser) {
ModelAndView mav = null; ModelAndView mav = null;
if(loginUser == null){ if(loginUser == null){
mav = new ModelAndView("redirect:/login2"); mav = new ModelAndView("redirect:/login");
}else{ }else{
mav = new ModelAndView("redirect:/dashboard"); mav = new ModelAndView("redirect:/dashboard");
} }

8
src/main/java/com/dbnt/faisp/main/userInfo/UserMgtController.java
View File

@ -37,13 +37,13 @@ public class UserMgtController {
public ModelAndView userMgtPage(@AuthenticationPrincipal UserInfo loginUser, UserInfo userInfo) { public ModelAndView userMgtPage(@AuthenticationPrincipal UserInfo loginUser, UserInfo userInfo) {
ModelAndView mav = new ModelAndView("adminPage/userMgt/userMgt"); ModelAndView mav = new ModelAndView("adminPage/userMgt/userMgt");
userInfo.setQueryInfo(); userInfo.setQueryInfo();
if(userInfo.getUserStatus() == null || userInfo.getUserStatus().equals("")) {
userInfo.setUserStatus("USC003");
}
userInfo.setDownOrganCdList(loginUser.getDownOrganCdList()); userInfo.setDownOrganCdList(loginUser.getDownOrganCdList());
mav.addObject("userInfoList", userInfoService.selectUserInfoList(userInfo)); mav.addObject("userInfoList", userInfoService.selectUserInfoList(userInfo));
userInfo.setContentCnt(userInfoService.selectUserInfoListCnt(userInfo)); userInfo.setContentCnt(userInfoService.selectUserInfoListCnt(userInfo));
userInfo.setPaginationInfo(); userInfo.setPaginationInfo();
mav.addObject("mgtOrganList", loginUser.getDownOrganCdList());
mav.addObject("searchParams", userInfo); mav.addObject("searchParams", userInfo);
return mav; return mav;
} }
@ -124,12 +124,12 @@ public class UserMgtController {
public ModelAndView accessChangePage(@AuthenticationPrincipal UserInfo loginUser, UserInfo userInfo){ public ModelAndView accessChangePage(@AuthenticationPrincipal UserInfo loginUser, UserInfo userInfo){
ModelAndView mav = new ModelAndView("adminPage/userMgt/accessChange"); ModelAndView mav = new ModelAndView("adminPage/userMgt/accessChange");
userInfo.setQueryInfo(); userInfo.setQueryInfo();
userInfo.setUserStatus("USC003");
userInfo.setUserRole(loginUser.getUserRole()); userInfo.setUserRole(loginUser.getUserRole());
userInfo.setDownOrganCdList(loginUser.getDownOrganCdList()); userInfo.setDownOrganCdList(loginUser.getDownOrganCdList());
mav.addObject("userInfoList", userInfoService.selectUserInfoList(userInfo)); mav.addObject("userInfoList", userInfoService.selectUserInfoList(userInfo));
userInfo.setContentCnt(userInfoService.selectUserInfoListCnt(userInfo)); userInfo.setContentCnt(userInfoService.selectUserInfoListCnt(userInfo));
userInfo.setPaginationInfo(); userInfo.setPaginationInfo();
mav.addObject("mgtOrganList", loginUser.getDownOrganCdList());
mav.addObject("searchParams", userInfo); mav.addObject("searchParams", userInfo);
return mav; return mav;
} }

2
src/main/resources/mybatisMapper/UserInfoMapper.xml
View File

@ -11,7 +11,7 @@
user_status = #{userStatus} user_status = #{userStatus}
</when> </when>
<otherwise> <otherwise>
user_status = 'USC003' user_status in ('USC003', 'USC007')
</otherwise> </otherwise>
</choose> </choose>
<if test='userId != null and userId != ""'> <if test='userId != null and userId != ""'>

6
src/main/resources/templates/adminPage/userMgt/accessChange.html
View File

@ -31,8 +31,10 @@
<div class="col-auto"> <div class="col-auto">
<select class="form-select form-select-sm" name="ogCd" id="ogCdSearch"> <select class="form-select form-select-sm" name="ogCd" id="ogCdSearch">
<option value="">관서 선택</option> <option value="">관서 선택</option>
<th:block th:each="commonCode:${session.commonCode.get('OG')}"> <th:block th:each="code:${session.commonCode.get('OG')}">
<option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}" th:selected="${searchParams.ogCd==commonCode.itemCd}"></option> <th:block th:if="${code.useChk eq 'T' and #lists.contains(mgtOrganList, code.itemCd)}">
<option th:value="${code.itemCd}" th:text="${code.itemValue}" th:selected="${searchParams.ogCd eq code.itemCd}"></option>
</th:block>
</th:block> </th:block>
</select> </select>
</div> </div>

4
src/main/resources/templates/adminPage/userMgt/userMgt.html
View File

@ -42,7 +42,9 @@
<select class="form-select form-select-sm" name="ogCd" id="ogCdSearch"> <select class="form-select form-select-sm" name="ogCd" id="ogCdSearch">
<option value="">관서 선택</option> <option value="">관서 선택</option>
<th:block th:each="code:${session.commonCode.get('OG')}"> <th:block th:each="code:${session.commonCode.get('OG')}">
<option th:value="${code.itemCd}" th:text="${code.itemValue}" th:selected="${searchParams.ogCd eq code.itemCd}"></option> <th:block th:if="${code.useChk eq 'T' and #lists.contains(mgtOrganList, code.itemCd)}">
<option th:value="${code.itemCd}" th:text="${code.itemValue}" th:selected="${searchParams.ogCd eq code.itemCd}"></option>
</th:block>
</th:block> </th:block>
</select> </select>
</div> </div>