diff --git a/src/main/java/com/dbnt/kcgfilemanager/model/UserInfo.java b/src/main/java/com/dbnt/kcgfilemanager/model/UserInfo.java
index 2621f3c..35ffb52 100644
--- a/src/main/java/com/dbnt/kcgfilemanager/model/UserInfo.java
+++ b/src/main/java/com/dbnt/kcgfilemanager/model/UserInfo.java
@@ -34,9 +34,9 @@ public class UserInfo extends BaseModel implements UserDetails{
@Column(name = "NAME")
private String name;
@Column(name = "POSITION")
- private int position;
+ private Integer position;
@Column(name = "DEPARTMENT")
- private int department;
+ private Integer department;
@Column(name = "USER_ROLE")
private String userRole;
@Column(name = "CREATE_DATE", updatable = false)
diff --git a/src/main/java/com/dbnt/kcgfilemanager/service/UserInfoService.java b/src/main/java/com/dbnt/kcgfilemanager/service/UserInfoService.java
index 40a9b22..f94f128 100644
--- a/src/main/java/com/dbnt/kcgfilemanager/service/UserInfoService.java
+++ b/src/main/java/com/dbnt/kcgfilemanager/service/UserInfoService.java
@@ -22,6 +22,9 @@ public class UserInfoService implements UserDetailsService {
@Transactional
public String insertUserInfo(UserInfo userInfo){
+ if(userInfoRepository.findByUserId(userInfo.getUserId()).orElse(null) != null){
+ return "userIdDuplication";
+ }
userInfo.setPassword(convertPassword(userInfo.getPassword()));
return userInfoRepository.save(userInfo).getUserId();
}
diff --git a/src/main/resources/mybatisMapper/UserInfoMapper.xml b/src/main/resources/mybatisMapper/UserInfoMapper.xml
index feef74d..c0621bf 100644
--- a/src/main/resources/mybatisMapper/UserInfoMapper.xml
+++ b/src/main/resources/mybatisMapper/UserInfoMapper.xml
@@ -20,18 +20,18 @@
ON A.POSITION = B.CODE_SQ
INNER JOIN COMMON_CODE C
on A.DEPARTMENT = C.CODE_SQ
-
+ WHERE A.USER_STATUS != 'D'
AND A.USER_ID LIKE CONCAT ('%', #{userId},'%')
- AND A.USER_ID LIKE CONCAT ('%', #{name},'%')
+ AND A.NAME LIKE CONCAT ('%', #{name},'%')
-
- AND B.VALUE LIKE CONCAT ('%', #{positionName},'%')
+
+ AND A.POSITION = #{position}
-
- AND C.VALUE LIKE CONCAT ('%', #{departmentName},'%')
+
+ AND A.DEPARTMENT = #{department}
AND A.CREATE_DATE >= #{startDate}
@@ -39,7 +39,6 @@
AND A.CREATE_DATE <= #{endDate}
-
ORDER BY CREATE_DATE DESC
LIMIT #{rowCnt} OFFSET #{firstIndex}
@@ -47,22 +46,18 @@
\ No newline at end of file
diff --git a/src/main/resources/static/js/admin/userMgt.js b/src/main/resources/static/js/admin/userMgt.js
index a4573e8..555c8e1 100644
--- a/src/main/resources/static/js/admin/userMgt.js
+++ b/src/main/resources/static/js/admin/userMgt.js
@@ -30,9 +30,6 @@ $(document).on('click', '.page-item', function (){
$("#searchBtn").click();
})
-$(document).on('change', '#searchConditionSelector', function (){
- setSearchCondition();
-})
$(document).on('change', '#passwordUpdateFlag', function (){
const passwordDiv = $(".passwordDiv");
if(this.checked){
@@ -53,10 +50,14 @@ $(document).on('click', '#saveBtn', function (){
url : "/admin/insertUserInfo",
processData: false,
contentType: false,
- success : function(data) {
- alert("저장되었습니다.")
- $("#closeModalBtn").click();
- $("#searchBtn").click();
+ success : function(result) {
+ if(result === "userIdDuplication"){
+ alert("등록된 아이디입니다.")
+ }else{
+ alert("저장되었습니다.")
+ $("#closeModalBtn").click();
+ $("#searchBtn").click();
+ }
},
error : function(xhr, status) {
@@ -212,22 +213,4 @@ function childCategoryStatusChange(parentSeq, flag){
childCategoryStatusChange($(el).attr("data-categoryseq"), flag);
})
}
-}
-
-function setSearchCondition(){
- const searchConditionSelector = $("#searchConditionSelector").val();
- const searchTextDiv = $("#searchTextDiv");
- const dateSelectorDiv = $("#dateSelectorDiv");
- if(searchConditionSelector === "createDate"){
- dateSelectorDiv.show();
- dateSelectorDiv.children().removeAttr("disabled");
- searchTextDiv.hide();
- searchTextDiv.children().attr("disabled", "disabled");
- }else{
- $("#textSearch").attr("name", searchConditionSelector);
- searchTextDiv.show();
- searchTextDiv.children().removeAttr("disabled");
- dateSelectorDiv.hide();
- dateSelectorDiv.children().attr("disabled", "disabled");
- }
}
\ No newline at end of file
diff --git a/src/main/resources/templates/admin/userInfo.html b/src/main/resources/templates/admin/userInfo.html
index b53284a..bc3b1cb 100644
--- a/src/main/resources/templates/admin/userInfo.html
+++ b/src/main/resources/templates/admin/userInfo.html
@@ -62,6 +62,7 @@
diff --git a/src/main/resources/templates/admin/userMgt.html b/src/main/resources/templates/admin/userMgt.html
index f949ec7..b7c5190 100644
--- a/src/main/resources/templates/admin/userMgt.html
+++ b/src/main/resources/templates/admin/userMgt.html
@@ -32,34 +32,51 @@
-
-
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-