권한 수정 완료

wyu

2021-12-10 debc7d47107b1fc4509593d942d775f4374a3416

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

@@ -3,6 +3,7 @@
import com.google.common.collect.Lists;
import kr.wisestone.owl.common.ExcelConditionCheck;
import kr.wisestone.owl.constant.Constants;
import kr.wisestone.owl.constant.MngPermission;
import kr.wisestone.owl.constant.MsgConstants;
import kr.wisestone.owl.domain.*;
import kr.wisestone.owl.domain.enumType.EmailType;
@@ -11,12 +12,14 @@
import kr.wisestone.owl.mapper.ProjectMapper;
import kr.wisestone.owl.repository.ProjectClosureRepository;
import kr.wisestone.owl.repository.ProjectRepository;
import kr.wisestone.owl.repository.UserDepartmentRepository;
import kr.wisestone.owl.service.*;
import kr.wisestone.owl.util.CommonUtil;
import kr.wisestone.owl.util.ConvertUtil;
import kr.wisestone.owl.util.DateUtil;
import kr.wisestone.owl.vo.*;
import kr.wisestone.owl.web.condition.ProjectCondition;
import kr.wisestone.owl.web.condition.WidgetCondition;
import kr.wisestone.owl.web.form.ProjectForm;
import kr.wisestone.owl.web.view.ExcelView;
import org.apache.commons.lang3.StringUtils;
@@ -48,7 +51,7 @@
    private DepartmentService departmentService;

    @Autowired
    private UserDepartmentService userDepartmentService;
    private UserDepartmentRepository userDepartmentRepository;

    @Autowired
    private ProjectRoleService projectRoleService;
@@ -61,6 +64,9 @@

    @Autowired
    private UserWorkspaceService userWorkspaceService;

    @Autowired
    private UserLevelService userLevelService;

    @Autowired
    private SystemEmailService systemEmailService;
@@ -328,6 +334,19 @@
        }
    }

    void SetMyDepartmentId(ProjectCondition projectCondition){
        Long loginId = projectCondition.getLoginUserId();
        List<Long> myDepartmentIds = Lists.newArrayList();
        List<UserDepartment> myDepartments = this.userDepartmentRepository.findByUserId(loginId);

        if(myDepartments != null && myDepartments.size() > 0){
            for(UserDepartment myDepartment : myDepartments){
                myDepartmentIds.add(myDepartment.getDepartmentId());
            }
        }
        projectCondition.setMyDepartmentIds(myDepartmentIds);
    }

    //  프로젝트 목록을 조회한다.
    @Override
    @Transactional(readOnly = true)
@@ -347,11 +366,14 @@
        if (condition.getWorkspaceManager()) {
            //  업무공간 관리자일 경우 모든 프로젝트가 표시되어야 한다.
            //  관리자일 때
            if (this.userWorkspaceService.checkWorkspaceManager(user)) {
            UserLevel userLevel = this.userLevelService.getUserLevel(user.getUserLevel().getId());
            if (this.userWorkspaceService.checkWorkspaceManager(user)
                    || MngPermission.checkMngPermission(userLevel.getPermission(), MngPermission.USER_PERMISSION_MNG_ISSUE_PROJECT_ALL)) {
                results = this.projectMapper.findByWorkspaceManager(condition);
                totalCount = this.projectMapper.countByWorkspaceManager(condition);
            }
            else {
                this.SetMyDepartmentId(condition);
                results = this.projectMapper.find(condition);
                totalCount = this.projectMapper.count(condition);
            }
@@ -1099,6 +1121,7 @@
    @Transactional(readOnly = true)
    public List<ProjectVo> findByIncludeProject(List<String> statuses, String projectType) {
        User user = this.webAppUtil.getLoginUserObject();
        UserLevel userLevel = this.userLevelService.getUserLevel(user.getUserLevel().getId());

        ProjectCondition projectCondition = new ProjectCondition();
        projectCondition.setLoginUserId(user.getId());
@@ -1108,7 +1131,8 @@

        List<Map<String, Object>> results;

        if (this.userWorkspaceService.checkWorkspaceManager(user)) {
        if (this.userWorkspaceService.checkWorkspaceManager(user)
                || MngPermission.checkMngPermission(userLevel.getPermission(), MngPermission.USER_PERMISSION_MNG_ISSUE_PROJECT_ALL)) {
            results = this.projectMapper.findByWorkspaceManager(projectCondition);
        } else {
            results = this.projectMapper.findByWorkspaceIdAndIncludeProject(projectCondition);