From ea93847f194f6e24c60da0b6f85384e1d2b4a9b6 Mon Sep 17 00:00:00 2001 From: chenwenjian Date: Mon, 3 Mar 2025 15:09:10 +0800 Subject: [PATCH] =?UTF-8?q?feat(REQ-3300):=20=E5=8F=91=E8=B5=B7=E5=AE=A1?= =?UTF-8?q?=E6=89=B9=E6=B5=81=E5=A1=AB=E5=85=85=E5=8F=82=E6=95=B0=E7=A1=AE?= =?UTF-8?q?=E8=AE=A4=E4=BA=BA=E8=BF=87=E6=BB=A4=E5=B7=A5=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../visa/server/service/impl/ChangeRecordServiceImpl.java | 4 +++- .../java/cn/axzo/nanopart/visa/server/utils/Constants.java | 5 +++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordServiceImpl.java b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordServiceImpl.java index 3ee23618..49ed85db 100644 --- a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordServiceImpl.java +++ b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordServiceImpl.java @@ -943,7 +943,9 @@ public class ChangeRecordServiceImpl extends ServiceImpl Objects.nonNull(p.getJob()) && !Objects.equals(p.getJob().getCode(), Constants.PROJECT_TEAM_WORKER_JOB_CODE)) + .collect(Collectors.toList()); } private List> buildContextDescription(List list) { diff --git a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/utils/Constants.java b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/utils/Constants.java index 4ed08cdf..a408fcda 100644 --- a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/utils/Constants.java +++ b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/utils/Constants.java @@ -98,6 +98,11 @@ public class Constants { */ public static String PROJECT_TEAM_LEADER_JOB_CODE = "projTeamLeader"; + /** + * 项目内班组工人岗位code + */ + public static String PROJECT_TEAM_WORKER_JOB_CODE = "projWorker"; + /** * 有班组时,优先取班组岗位