251222_01_FIX : 변수명 변경 및 Entity 생성 모두 빌더 타입으로 교체
This commit is contained in:
@@ -2,7 +2,7 @@ package com.kri.contact.server.service;
|
||||
|
||||
import com.kri.common.datetime.DateTimeUtil;
|
||||
import com.kri.common.web.BusinessException;
|
||||
import com.kri.contact.server.common.consts.AppConstant;
|
||||
import com.kri.contact.server.common.consts.ContactConstant;
|
||||
import com.kri.contact.server.dto.*;
|
||||
import com.kri.contact.server.dto.common.PageResponseDto;
|
||||
import com.kri.contact.server.persistence.entity.TPrjctEntity;
|
||||
@@ -57,8 +57,8 @@ public class ProjectService {
|
||||
ProjectSpecs.keywordLike(keyword)
|
||||
.and(ProjectSpecs.isDelFalse());
|
||||
|
||||
if (userRole >= AppConstant.OUTSOURCE_USER_ROLE) {
|
||||
if (userRole >= AppConstant.FIELDWORK_USER_ROLE) {
|
||||
if (userRole >= ContactConstant.OUTSOURCE_USER_ROLE) {
|
||||
if (userRole >= ContactConstant.FIELDWORK_USER_ROLE) {
|
||||
spec = spec.and(ProjectSpecs.statusIn(STATUS_1));
|
||||
} else {
|
||||
spec = spec.and(ProjectSpecs.statusIn(STATUS_0_1));
|
||||
@@ -83,8 +83,8 @@ public class ProjectService {
|
||||
.and(ProjectSpecs.ownerDeptIn(req.getOwnerDeptList()))
|
||||
.and(ProjectSpecs.ownerFwIn(req.getOwnerFwList()));
|
||||
|
||||
if (userRole >= AppConstant.OUTSOURCE_USER_ROLE) {
|
||||
if (userRole >= AppConstant.FIELDWORK_USER_ROLE) {
|
||||
if (userRole >= ContactConstant.OUTSOURCE_USER_ROLE) {
|
||||
if (userRole >= ContactConstant.FIELDWORK_USER_ROLE) {
|
||||
spec = spec.and(ProjectSpecs.statusIn(STATUS_1));
|
||||
} else {
|
||||
spec = spec.and(ProjectSpecs.statusIn(STATUS_0_1));
|
||||
@@ -115,8 +115,8 @@ public class ProjectService {
|
||||
|
||||
public List<String> getOwnerDeptList(Integer userRole) {
|
||||
final List<Short> statusList =
|
||||
(userRole < AppConstant.OUTSOURCE_USER_ROLE) ? null :
|
||||
(userRole < AppConstant.FIELDWORK_USER_ROLE) ? STATUS_0_1 :
|
||||
(userRole < ContactConstant.OUTSOURCE_USER_ROLE) ? null :
|
||||
(userRole < ContactConstant.FIELDWORK_USER_ROLE) ? STATUS_0_1 :
|
||||
STATUS_1;
|
||||
|
||||
return projectRepository.findDistinctOwnerDept(statusList);
|
||||
@@ -124,8 +124,8 @@ public class ProjectService {
|
||||
|
||||
public List<String> getOwnerFwList(Integer userRole) {
|
||||
final List<Short> statusList =
|
||||
(userRole < AppConstant.OUTSOURCE_USER_ROLE) ? null :
|
||||
(userRole < AppConstant.FIELDWORK_USER_ROLE) ? STATUS_0_1 :
|
||||
(userRole < ContactConstant.OUTSOURCE_USER_ROLE) ? null :
|
||||
(userRole < ContactConstant.FIELDWORK_USER_ROLE) ? STATUS_0_1 :
|
||||
STATUS_1;
|
||||
|
||||
return projectRepository.findDistinctOwnerFw(statusList);
|
||||
|
||||
Reference in New Issue
Block a user