diff --git a/src/main/java/com/kri/contact/server/common/consts/ContactConstant.java b/src/main/java/com/kri/contact/server/common/consts/ContactConstant.java index fb0b743..1ff3d82 100644 --- a/src/main/java/com/kri/contact/server/common/consts/ContactConstant.java +++ b/src/main/java/com/kri/contact/server/common/consts/ContactConstant.java @@ -19,6 +19,7 @@ public final class ContactConstant { public static final String DEFAULT_USER_TEAM = "S101"; public static final String DEFAULT_CALLER_TELNUM = "0234155100"; + public static final int RESEARCHER_USER_ROLE = 2000; public static final int OUTSOURCE_USER_ROLE = 4000; public static final int FIELDWORK_USER_ROLE = 9000; public static final int CONTACT_INTERVIEWER_ROLE = 9002; diff --git a/src/main/java/com/kri/contact/server/controller/ProjectController.java b/src/main/java/com/kri/contact/server/controller/ProjectController.java index 91664bb..6078131 100644 --- a/src/main/java/com/kri/contact/server/controller/ProjectController.java +++ b/src/main/java/com/kri/contact/server/controller/ProjectController.java @@ -55,7 +55,7 @@ public class ProjectController { RequestUserContext ctx ) { return projectService.getTopProject(topCount, keyword, ctx.getUserId(), ctx.getUserCmpn(), - ctx.getUserRole()); + ctx.getUserTeam(), ctx.getUserRole()); } @Operation(summary = "프로젝트 목록 조회") @@ -64,7 +64,8 @@ public class ProjectController { @Valid @RequestBody ProjectSearchRequestDto req, RequestUserContext ctx ) { - return projectService.searchProject(req, ctx.getUserId(), ctx.getUserCmpn(), ctx.getUserRole()); + return projectService.searchProject(req, ctx.getUserId(), ctx.getUserCmpn(), ctx.getUserTeam(), + ctx.getUserRole()); } @Operation(summary = "프로젝트를 소유하고 있는 모든 부서/실사 목록 조회") diff --git a/src/main/java/com/kri/contact/server/persistence/query/ProjectSpecs.java b/src/main/java/com/kri/contact/server/persistence/query/ProjectSpecs.java index 49c3d90..09553de 100644 --- a/src/main/java/com/kri/contact/server/persistence/query/ProjectSpecs.java +++ b/src/main/java/com/kri/contact/server/persistence/query/ProjectSpecs.java @@ -47,6 +47,15 @@ public class ProjectSpecs { }; } + public static Specification ownerDeptEqual(String ownerDept) { + return (root, query, cb) -> { + if (!StringUtils.hasText(ownerDept)) { + return cb.disjunction(); + } + return cb.equal(root.get("ownerDept"), ownerDept.trim()); + }; + } + public static Specification ownerFwIn(List list) { return (root, query, cb) -> { if (list == null || list.isEmpty()) { diff --git a/src/main/java/com/kri/contact/server/service/ProjectService.java b/src/main/java/com/kri/contact/server/service/ProjectService.java index 5db8f9c..33a9473 100644 --- a/src/main/java/com/kri/contact/server/service/ProjectService.java +++ b/src/main/java/com/kri/contact/server/service/ProjectService.java @@ -97,12 +97,15 @@ public class ProjectService { String keyword, String userId, String userCmpn, + String userTeam, Integer userRole ) { Specification spec = ProjectSpecs.keywordLike(keyword) .and(ProjectSpecs.isDelFalse()); - if (userRole >= ContactConstant.OUTSOURCE_USER_ROLE) { + if (isTeamUserRole(userRole)) { + spec = spec.and(ProjectSpecs.ownerDeptEqual(userTeam)); + } else if (userRole >= ContactConstant.OUTSOURCE_USER_ROLE) { if (userRole >= ContactConstant.FIELDWORK_USER_ROLE) { spec = spec.and(ProjectSpecs.statusIn(STATUS_1)); } else { @@ -122,6 +125,7 @@ public class ProjectService { ProjectSearchRequestDto req, String userId, String userCmpn, + String userTeam, Integer userRole ) { Specification spec = ProjectSpecs.keywordLike(req.getPrjctText()) @@ -130,7 +134,9 @@ public class ProjectService { .and(ProjectSpecs.ownerDeptIn(req.getOwnerDeptList())) .and(ProjectSpecs.ownerFwIn(req.getOwnerFwList())); - if (userRole >= ContactConstant.OUTSOURCE_USER_ROLE) { + if (isTeamUserRole(userRole)) { + spec = spec.and(ProjectSpecs.ownerDeptEqual(userTeam)); + } else if (userRole >= ContactConstant.OUTSOURCE_USER_ROLE) { if (userRole >= ContactConstant.FIELDWORK_USER_ROLE) { spec = spec.and(ProjectSpecs.statusIn(STATUS_1)); } else { @@ -405,6 +411,12 @@ public class ProjectService { private record ResolvedSurveyUrl(String finalUrl, String fullUrl, String shortUrl) { } + private boolean isTeamUserRole(Integer userRole) { + return userRole != null + && userRole >= ContactConstant.RESEARCHER_USER_ROLE + && userRole < ContactConstant.RESEARCHER_USER_ROLE + 1000; + } + private String makePrjctCd(String itrntPrjctCd) { String prefix = itrntPrjctCd + "_";