diff --git a/src/main/java/com/dbnt/faisp/config/BaseController.java b/src/main/java/com/dbnt/faisp/config/BaseController.java
index 6760fee2..dc01ad34 100644
--- a/src/main/java/com/dbnt/faisp/config/BaseController.java
+++ b/src/main/java/com/dbnt/faisp/config/BaseController.java
@@ -46,7 +46,7 @@ public class BaseController {
public ModelAndView loginCheck(@AuthenticationPrincipal UserInfo loginUser) {
ModelAndView mav = null;
if(loginUser == null){
- mav = new ModelAndView("redirect:/login2");
+ mav = new ModelAndView("redirect:/login");
}else{
mav = new ModelAndView("redirect:/dashboard");
}
diff --git a/src/main/java/com/dbnt/faisp/main/userInfo/UserMgtController.java b/src/main/java/com/dbnt/faisp/main/userInfo/UserMgtController.java
index 86637ec2..b78c6c5a 100644
--- a/src/main/java/com/dbnt/faisp/main/userInfo/UserMgtController.java
+++ b/src/main/java/com/dbnt/faisp/main/userInfo/UserMgtController.java
@@ -37,13 +37,13 @@ public class UserMgtController {
public ModelAndView userMgtPage(@AuthenticationPrincipal UserInfo loginUser, UserInfo userInfo) {
ModelAndView mav = new ModelAndView("adminPage/userMgt/userMgt");
userInfo.setQueryInfo();
- if(userInfo.getUserStatus() == null || userInfo.getUserStatus().equals("")) {
- userInfo.setUserStatus("USC003");
- }
userInfo.setDownOrganCdList(loginUser.getDownOrganCdList());
+
mav.addObject("userInfoList", userInfoService.selectUserInfoList(userInfo));
userInfo.setContentCnt(userInfoService.selectUserInfoListCnt(userInfo));
userInfo.setPaginationInfo();
+
+ mav.addObject("mgtOrganList", loginUser.getDownOrganCdList());
mav.addObject("searchParams", userInfo);
return mav;
}
@@ -124,12 +124,12 @@ public class UserMgtController {
public ModelAndView accessChangePage(@AuthenticationPrincipal UserInfo loginUser, UserInfo userInfo){
ModelAndView mav = new ModelAndView("adminPage/userMgt/accessChange");
userInfo.setQueryInfo();
- userInfo.setUserStatus("USC003");
userInfo.setUserRole(loginUser.getUserRole());
userInfo.setDownOrganCdList(loginUser.getDownOrganCdList());
mav.addObject("userInfoList", userInfoService.selectUserInfoList(userInfo));
userInfo.setContentCnt(userInfoService.selectUserInfoListCnt(userInfo));
userInfo.setPaginationInfo();
+ mav.addObject("mgtOrganList", loginUser.getDownOrganCdList());
mav.addObject("searchParams", userInfo);
return mav;
}
diff --git a/src/main/resources/mybatisMapper/UserInfoMapper.xml b/src/main/resources/mybatisMapper/UserInfoMapper.xml
index 7a699686..86a8d89d 100644
--- a/src/main/resources/mybatisMapper/UserInfoMapper.xml
+++ b/src/main/resources/mybatisMapper/UserInfoMapper.xml
@@ -11,7 +11,7 @@
user_status = #{userStatus}
- user_status = 'USC003'
+ user_status in ('USC003', 'USC007')
diff --git a/src/main/resources/templates/adminPage/userMgt/accessChange.html b/src/main/resources/templates/adminPage/userMgt/accessChange.html
index 166a5596..ba117005 100644
--- a/src/main/resources/templates/adminPage/userMgt/accessChange.html
+++ b/src/main/resources/templates/adminPage/userMgt/accessChange.html
@@ -31,8 +31,10 @@
diff --git a/src/main/resources/templates/adminPage/userMgt/userMgt.html b/src/main/resources/templates/adminPage/userMgt/userMgt.html
index 81def043..0626633f 100644
--- a/src/main/resources/templates/adminPage/userMgt/userMgt.html
+++ b/src/main/resources/templates/adminPage/userMgt/userMgt.html
@@ -42,7 +42,9 @@