From 267bf376e0b3b262d41bdcb10cd1db8b513e26e1 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Sun, 4 Feb 2024 10:57:48 +0800
Subject: [PATCH] =?UTF-8?q?fix=2080084=20=E9=A1=B9=E7=9B=AE=E5=90=88?=
 =?UTF-8?q?=E8=A7=84=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B-=E5=A4=9A?=
 =?UTF-8?q?=E4=BA=BA=E6=8F=90=E4=BA=A4=E7=9B=B8=E5=90=8C=E7=9A=84=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=9C=A8=E8=BF=99=E4=B8=AA=E9=A1=B5=E9=9D=A2=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E5=A4=9A=E6=9D=A1=EF=BC=8C=E4=BD=86=E6=8C=89=E7=85=A7?=
 =?UTF-8?q?=E6=9D=A1=E6=AC=BE=E8=B5=B0=E6=B5=81=E7=A8=8B=EF=BC=8C=E4=B8=8A?=
 =?UTF-8?q?=E9=9D=A2=E8=BF=9B=E8=A1=8C=E6=8F=90=E7=A4=BA=E7=9A=84=E6=A0=87?=
 =?UTF-8?q?=E5=87=86=E5=8F=AA=E5=B1=95=E7=A4=BA=E4=BA=86=E4=B8=80=E6=AC=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/ProcessProjectAssessService.java         | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessService.java
index e447e89c..ef6c7454 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessService.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessService.java
@@ -284,7 +284,9 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
         Map<String, ProcessProjectAssessTerm> splitInfoIdMap = processProjectAssessTermService.getSplitInfoIdMap(assessmentId);
         List<ProcessProjectAssessTerm> allProjectAssesTermList = new ArrayList<>();
         List<String> usedSplitInfoId = new ArrayList<>();
+        String previousAssessorId = null;
         for (ProcessProjectAssessTerm term : processProjectAssessTermList) {
+            String assessorId = term.getAssessorId();
             String splitInfoId = term.getSplitInfoId();
             if (!usedSplitInfoId.contains(splitInfoId) && splitInfoIdMap.containsKey(splitInfoId)) {
                 usedSplitInfoId.add(splitInfoId);
@@ -296,7 +298,17 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
                 term1.setCanAssignFlag(YesOrNoEnum.NO.getInteger());
                 term1.setPromoter(createUserName);
                 allProjectAssesTermList.add(term1);
+            }else if (usedSplitInfoId.contains(splitInfoId) && splitInfoIdMap.containsKey(splitInfoId) && !Objects.equals(previousAssessorId,assessorId)){
+                ProcessProjectAssessTerm titleTerm = splitInfoIdMap.get(splitInfoId);
+                ProcessProjectAssessTerm term1 = new ProcessProjectAssessTerm();
+                term1.setTermName(titleTerm.getTermName());
+                term1.setTermNumber(titleTerm.getTermNumber());
+                term1.setTermText(decompositionOrderSourceMap.get(titleTerm.getTermText()));
+                term1.setCanAssignFlag(YesOrNoEnum.NO.getInteger());
+                term1.setPromoter(createUserName);
+                allProjectAssesTermList.add(term1);
             }
+            previousAssessorId = assessorId;
             allProjectAssesTermList.add(term);
         }
         ProcessProjectAssess projectAssess = this.getById(assessmentId);