사용자 관리 부서 상세 백앤드 수정

wyu

2021-11-11 5a5753e69b2901cb3bb55623ca7d5beef2c727ab

사용자 관리 부서 상세 백앤드 수정

 src/main/java/kr/wisestone/owl/service/DepartmentService.java

@@ -33,4 +33,6 @@

    List<Map<String, Object>> findByDepartmentIds( UserCondition condition);



}

 src/main/java/kr/wisestone/owl/service/impl/DepartmentServiceImpl.java

@@ -105,17 +105,10 @@
        }

        for (Long id : departmentForm.getRemoveIds()) {
            if (!this.userService.useUserLevel(id)) {
                this.departmentRepository.deleteById(id);
            } else {
                throw new OwlRuntimeException(
                        this.messageAccessor.getMessage(MsgConstants.DEPARTMENT_ALREADY_IN_USE));
            }

            this.departmentRepository.deleteById(id);
            this.departmentRepository.flush();
        }
        this.departmentRepository.flush();
    }



    // 부서 목록을 엑셀로 다운로드 한다.
@@ -170,7 +163,6 @@

        return department;
    }


    //  삭제 할 부서 유저가 사용하고 있는지 확인
    @Override

 src/main/java/kr/wisestone/owl/service/impl/UserServiceImpl.java

@@ -236,6 +236,13 @@
            /*user.setPermission(MngPermission.USER_PERMISSION_MNG_NONE);*/

        } else if(validAdmin == 1) {    // 라이센스 입력 관리자

            DepartmentForm departmentForm = new DepartmentForm();

            departmentForm.setDepartmentName("부서 없음");
            Department department = this.departmentService.add(departmentForm);
            this.departmentRepository.saveAndFlush(department);

            Workspace primaryWorkspace = this.workspaceService.getPrimaryWorkspace();

            UserLevel userLevel = this.userLevelService.addSuperUserLevel();
@@ -263,13 +270,6 @@
                /*user.setPermission(MngPermission.makeSubAllPermission());*/
            }
        }
        DepartmentForm departmentForm = new DepartmentForm();

        departmentForm.setDepartmentName("부서 없음");
        Department department = this.departmentService.add(departmentForm);

        // wyu
        this.departmentRepository.saveAndFlush(department);
        this.userRepository.saveAndFlush(user);

        //  이메일 알림 예정 시간이 공백이면 디폴트 이메일 알림 예정 시간으로 설정한다.

 src/main/java/kr/wisestone/owl/service/impl/UserWorkspaceServiceImpl.java

@@ -9,8 +9,10 @@
import kr.wisestone.owl.service.*;
import kr.wisestone.owl.util.CommonUtil;
import kr.wisestone.owl.util.ConvertUtil;
import kr.wisestone.owl.vo.DepartmentVo;
import kr.wisestone.owl.vo.ResPage;
import kr.wisestone.owl.vo.UserWorkspaceVo;
import kr.wisestone.owl.web.condition.UserCondition;
import kr.wisestone.owl.web.condition.UserWorkspaceCondition;
import kr.wisestone.owl.web.form.UserWorkspaceForm;
import org.slf4j.Logger;
@@ -91,6 +93,16 @@

        for (UserWorkspaceVo userWorkspaceVo : userWorkspaceVos) {
            userWorkspaceVo.setAccount(CommonUtil.decryptAES128(userWorkspaceVo.getAccount()));

            // UserCondition 는 원래 userId 가 없었다.
            UserCondition con = new UserCondition();
            // 그래서 Condition에 추가 해주고 set 하는데 그건 userWorkspaceVo 에서 Id 를 가져온다
            con.setId(userWorkspaceVo.getUserId());
            // findByDepartmentIds 라는걸 mapper로 만들어서 쿼리 for문을 돌리고 us
            List<Map<String, Object>> re = this.departmentService.findByDepartmentIds(con);
            List<DepartmentVo> vos = ConvertUtil.convertListToListClass(re, DepartmentVo.class);

            userWorkspaceVo.setDepartmentVos(vos);
        }

        resJsonData.put(Constants.REQ_KEY_PAGE_VO, new ResPage(pageable.getPageNumber(), pageable.getPageSize(),

 src/main/java/kr/wisestone/owl/vo/UserWorkspaceVo.java

@@ -1,5 +1,9 @@
package kr.wisestone.owl.vo;

import com.google.common.collect.Lists;

import java.util.List;

/**
 * Created by wisestone on 2018-10-02.
 */
@@ -11,6 +15,9 @@
    private Boolean useYn;
    private Long levelId;
    private Long departmentId;
    private Long userId;

    private List<DepartmentVo> departmentVos = Lists.newArrayList();

    public UserWorkspaceVo(){}

@@ -69,4 +76,20 @@
    public void setDepartmentId(Long departmentId) {
        this.departmentId = departmentId;
    }

    public List<DepartmentVo> getDepartmentVos() {
        return departmentVos;
    }

    public void setDepartmentVos(List<DepartmentVo> departmentVos) {
        this.departmentVos = departmentVos;
    }

    public Long getUserId() {
        return userId;
    }

    public void setUserId(Long userId) {
        this.userId = userId;
    }
}