diff --git a/src/main/java/com/dbnt/kcgfilemanager/model/UserInfo.java b/src/main/java/com/dbnt/kcgfilemanager/model/UserInfo.java index 6a5d636..b4ca676 100644 --- a/src/main/java/com/dbnt/kcgfilemanager/model/UserInfo.java +++ b/src/main/java/com/dbnt/kcgfilemanager/model/UserInfo.java @@ -41,6 +41,8 @@ public class UserInfo extends BaseModel implements UserDetails{ private String userRole; @Column(name = "CREATE_DATE", updatable = false) private LocalDateTime createDate; + @Column(name = "USER_STATUS") + private String userStatus; @Transient private String positionName; @@ -78,6 +80,6 @@ public class UserInfo extends BaseModel implements UserDetails{ @Override public boolean isEnabled() { - return true; + return userStatus.equals("T"); } } diff --git a/src/main/java/com/dbnt/kcgfilemanager/service/UserInfoService.java b/src/main/java/com/dbnt/kcgfilemanager/service/UserInfoService.java index a749bd7..17595a2 100644 --- a/src/main/java/com/dbnt/kcgfilemanager/service/UserInfoService.java +++ b/src/main/java/com/dbnt/kcgfilemanager/service/UserInfoService.java @@ -4,7 +4,6 @@ import com.dbnt.kcgfilemanager.mapper.UserInfoMapper; import com.dbnt.kcgfilemanager.model.UserInfo; import com.dbnt.kcgfilemanager.repository.UserInfoRepository; import lombok.RequiredArgsConstructor; -import org.springframework.security.core.userdetails.User; import org.springframework.security.core.userdetails.UserDetails; import org.springframework.security.core.userdetails.UserDetailsService; import org.springframework.security.core.userdetails.UsernameNotFoundException; @@ -13,7 +12,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.List; -import java.util.Optional; @Service @RequiredArgsConstructor @@ -37,6 +35,7 @@ public class UserInfoService implements UserDetailsService { targetUserInfo.setPosition(userInfo.getPosition()); targetUserInfo.setDepartment(userInfo.getDepartment()); targetUserInfo.setUserRole(userInfo.getUserRole()); + targetUserInfo.setUserStatus(userInfo.getUserStatus()); return targetUserInfo.getUserId(); } diff --git a/src/main/resources/mybatisMapper/UserInfoMapper.xml b/src/main/resources/mybatisMapper/UserInfoMapper.xml index 9da4e08..125ea67 100644 --- a/src/main/resources/mybatisMapper/UserInfoMapper.xml +++ b/src/main/resources/mybatisMapper/UserInfoMapper.xml @@ -13,7 +13,8 @@ A.DEPARTMENT AS department, C.VALUE AS departmentName, A.USER_ROLE AS userRole, - A.CREATE_DATE AS createDate + A.CREATE_DATE AS createDate, + A.USER_STATUS AS userStatus FROM USER_INFO A INNER JOIN COMMON_CODE B ON A.POSITION = B.CODE_SQ diff --git a/src/main/resources/static/js/admin/userMgt.js b/src/main/resources/static/js/admin/userMgt.js index eab3e3d..41a2285 100644 --- a/src/main/resources/static/js/admin/userMgt.js +++ b/src/main/resources/static/js/admin/userMgt.js @@ -77,7 +77,7 @@ $(document).on('click', '#updateBtn', function (){ contentType: false, success : function(data) { alert("저장되었습니다.") - $(".userInfoCheckBox:checked").click(); + $("#searchBtn").click(); }, error : function(xhr, status) { diff --git a/src/main/resources/templates/admin/userInfo.html b/src/main/resources/templates/admin/userInfo.html index c9ebc1c..8e80d34 100644 --- a/src/main/resources/templates/admin/userInfo.html +++ b/src/main/resources/templates/admin/userInfo.html @@ -56,6 +56,15 @@ +
+ +
+ +
+
diff --git a/src/main/resources/templates/admin/userMgt.html b/src/main/resources/templates/admin/userMgt.html index 80e6add..152b53c 100644 --- a/src/main/resources/templates/admin/userMgt.html +++ b/src/main/resources/templates/admin/userMgt.html @@ -73,6 +73,7 @@ 부서 직급 생성일 + 상태 @@ -85,6 +86,7 @@ + diff --git a/src/main/resources/templates/login.html b/src/main/resources/templates/login.html index d8650e2..e7caa6c 100644 --- a/src/main/resources/templates/login.html +++ b/src/main/resources/templates/login.html @@ -11,7 +11,7 @@ -

Wrong user or password

+

로그인에 실패하였습니다.

diff --git a/src/main/resources/templates/login/denied.html b/src/main/resources/templates/login/denied.html index 739b366..10f5768 100644 --- a/src/main/resources/templates/login/denied.html +++ b/src/main/resources/templates/login/denied.html @@ -4,8 +4,8 @@ xmlns:sec="http://www.thymeleaf.org/thymeleaf-extras-springsecurity5" xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout/layout}"> -
-

This is denied Page.

+
+

권한 부족으로 접근이 거부되었습니다.


\ No newline at end of file