사용자 정보($rootScope.user)에 사용자등급명, 부서명, 추가 진행중

wyu

2021-12-23 a5b5358a21608069d9bc390074b5d930da88a4bd

사용자 정보($rootScope.user)에 사용자등급명, 부서명, 추가 진행중

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

@@ -1,5 +1,6 @@
package kr.wisestone.owl.service;

import kr.wisestone.owl.domain.Department;
import kr.wisestone.owl.domain.UserDepartment;
import kr.wisestone.owl.web.condition.UserCondition;
import kr.wisestone.owl.web.condition.UserDepartmentCondition;
@@ -16,4 +17,6 @@
    void userDepartmentModify(UserDepartmentForm userDepartmentForm);

    List<UserDepartment> findByDepartmentId(Long id);

    List<Department> findDepartment(Long id);
}

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

@@ -5,14 +5,15 @@
import kr.wisestone.owl.constant.MsgConstants;
import kr.wisestone.owl.domain.*;
import kr.wisestone.owl.exception.OwlRuntimeException;
import kr.wisestone.owl.mapper.UserMapper;
import kr.wisestone.owl.repository.UserDepartmentRepository;
import kr.wisestone.owl.service.DepartmentService;
import kr.wisestone.owl.service.UserDepartmentService;
import kr.wisestone.owl.service.UserService;
import kr.wisestone.owl.util.ConvertUtil;
import kr.wisestone.owl.util.MapUtil;
import kr.wisestone.owl.vo.*;
import kr.wisestone.owl.web.condition.DepartmentCondition;
import kr.wisestone.owl.web.condition.UserCondition;
import kr.wisestone.owl.web.condition.UserDepartmentCondition;
import kr.wisestone.owl.web.form.UserDepartmentForm;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.jpa.repository.JpaRepository;
@@ -94,6 +95,20 @@
        return this.userDepartmentRepository.findByDepartmentId(id);
    }

    @Override
    public List<Department> findDepartment(Long userId) {
        List<UserDepartment> userDepartments = this.userDepartmentRepository.findByUserId(userId);
        if (userDepartments != null && userDepartments.size() > 0) {

            List<Department> departments = Lists.newArrayList();
            for (UserDepartment userDepartment : userDepartments) {
                Department department = this.departmentService.getDepartment(userDepartment.getDepartmentId());
                departments.add(department);
            }
            return departments;
        }
        return null;
    }

    // 사용자 부서 ID로 조회한다.
//    @Override

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

@@ -107,6 +107,9 @@
    private AttachedFileService attachedFileService;

    @Autowired
    private UserDepartmentService userDepartmentService;

    @Autowired
    private IssueService issueService;

    @Autowired
@@ -1245,6 +1248,16 @@
        // user에서 Permission 값을 가져와서 userVo 에 setPermission 함
        userVo.setPermission(user.getPermission());
        userVo.setAccount(CommonUtil.decryptAES128(userVo.getAccount()));

        UserLevel userLevel = user.getUserLevel();
        if (userLevel != null) {
            userVo.setLevelName(userLevel.getLevelName());
        }

        List<Department> departments = this.userDepartmentService.findDepartment(user.getId());
        if (departments != null) {
            userVo.setDepartmentVos(ConvertUtil.convertObjectsToClasses(departments, DepartmentVo.class));
        }
        resJsonData.put(Constants.RES_KEY_CONTENTS, userVo);
        //  사용자 세션 정보를 분석해서 로그에 남긴다.
        log.info(ElasticSearchUtil.makeUserSessionHistoryMessage(httpServletRequest, userVo));

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

@@ -22,6 +22,8 @@
    private Long lastProjectId;
    private Long lastIssueTypeId;
    private Long departmentId;
    private String levelName;
    private List<DepartmentVo> departmentVos = Lists.newArrayList();
    private Boolean userSocialLogin = Boolean.FALSE;
    private List<ProjectVo> projectVos = Lists.newArrayList();
    private String reservationNotifyTime;
@@ -214,4 +216,20 @@
    public void setProjectManagerYN(Boolean projectManagerYN) {
        this.projectManagerYN = projectManagerYN;
    }

    public String getLevelName() {
        return levelName;
    }

    public void setLevelName(String levelName) {
        this.levelName = levelName;
    }

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

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

 src/main/webapp/views/common/sidebar.html

@@ -184,8 +184,8 @@
    </div>

    <div class="logged-user-w avatar-inline">
        <div class="row mb-1" ng-if="$root.myLevel != null" >
            <span class="issue-main-label offset-detail-5 badge badge-primary">{{$root.myLevel}}</span>
        <div class="row mb-1" ng-if="$root.user.levelName != null" >
            <span class="issue-main-label offset-detail-5 badge badge-primary">{{$root.user.levelName}}</span>
            <span class="issue-main-label offset-detail-1 badge badge-department">{{$root.myDepartments}}</span>
        </div>
        <div class="logged-user-i">