사용자의 부서 수정 기능 프론트 및 백 수정

이민희

2021-11-11 3600e939238a3acdd78c82b8c9c573d439bd1294

사용자의 부서 수정 기능 프론트 및 백 수정

 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;
    }


 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>



 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) {