From 3600e939238a3acdd78c82b8c9c573d439bd1294 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 11 11월 2021 18:40:19 +0900
Subject: [PATCH] 사용자의 부서 수정 기능 프론트 및 백 수정
---
src/main/java/kr/wisestone/owl/web/condition/UserCondition.java | 9 ++++++---
src/main/resources/mybatis/query-template/department-template.xml | 8 ++++++++
src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js | 2 +-
3 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/web/condition/UserCondition.java b/src/main/java/kr/wisestone/owl/web/condition/UserCondition.java
index 04f3c24..e084ecd 100644
--- a/src/main/java/kr/wisestone/owl/web/condition/UserCondition.java
+++ b/src/main/java/kr/wisestone/owl/web/condition/UserCondition.java
@@ -30,9 +30,12 @@
public static UserCondition make(Map<String, Object> conditions) {
UserCondition condition = ConvertUtil.convertMapToClass(conditions, UserCondition.class);
- condition.setStatuses(MapUtil.getStrings(conditions, "statuses"));
- condition.setExcludeIds(MapUtil.getLongs(conditions, "excludeIds"));
-
+ if (MapUtil.getStrings(conditions, "statuses") != null) {
+ condition.setStatuses(MapUtil.getStrings(conditions, "statuses"));
+ }
+ if (MapUtil.getStrings(conditions, "excludeIds") != null) {
+ condition.setExcludeIds(MapUtil.getLongs(conditions, "excludeIds"));
+ }
return condition;
}
diff --git a/src/main/resources/mybatis/query-template/department-template.xml b/src/main/resources/mybatis/query-template/department-template.xml
index 98aaf4d..5c0a05e 100644
--- a/src/main/resources/mybatis/query-template/department-template.xml
+++ b/src/main/resources/mybatis/query-template/department-template.xml
@@ -49,6 +49,14 @@
<if test="id != '' and id != null">
AND ud.user_id = #{id}
</if>
+ <choose>
+ <when test="excludeIds != null and excludeIds.size != 0">
+ AND d.id NOT IN
+ <foreach collection="excludeIds" item="item" index="index" separator="," open="(" close=")">
+ #{item}
+ </foreach>
+ </when>
+ </choose>
</select>
diff --git a/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js b/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js
index a5a0c30..a8f1813 100644
--- a/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js
+++ b/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js
@@ -136,7 +136,7 @@
makeTag += "<ul class='ul-not-comma'>";
if(scope.data.departmentVos.length == 0){ //�냽�빐�엳�뒗 遺��꽌媛� �뾾�쓣 寃쎌슦
- makeTag += "<div style='cursor: pointer' ng-click='event.modifyUserDepartments(data.id)'>遺��꽌瑜� �꽑�깮 �빐二쇱꽭�슂.</div>";
+ makeTag += "<div style='cursor: pointer' ng-click='event.modifyUserDepartments(data.id)'>遺��꽌瑜� �꽑�깮�빐 二쇱꽭�슂.</div>";
}else{
makeTag += "<div style='cursor: pointer' ng-click='event.modifyUserDepartments(data.id)'>";
angular.forEach(scope.data.departmentVos, function (departments) {
--
Gitblit v1.8.0