From 64fb127eac8272a9e9a90ca43d64baac5021c5f2 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Tue, 19 Dec 2023 09:07:06 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E9=A1=B9=E7=9B=AE=E5=90=88=E8=A7=84?=
 =?UTF-8?q?=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B=20=E6=B3=95=E8=A7=84?=
 =?UTF-8?q?=E5=B7=A5=E7=A8=8B=E5=B8=88=E5=BD=92=E6=A1=A3=E6=97=B6=E5=A4=9A?=
 =?UTF-8?q?=E5=9B=9E=E6=98=BE=E4=BA=86=E6=A0=87=E5=87=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../projectassess/service/ProcessProjectAssessService.java      | 2 +-
 .../projectassess/service/ProcessProjectAssessTermService.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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 19f34822..53e4696c 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
@@ -240,7 +240,7 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
         }
         //拼接分类法规标题
         List<DictModel> decompositionOrderSourceDictModels = sysBaseAPI.queryDictItemsByCode("decomposition_order_source");
-        Map<String, String> decompositionOrderSourceMap = CollStreamUtil.toMap(dictModels, DictModel::getValue, DictModel::getText);
+        Map<String, String> decompositionOrderSourceMap = CollStreamUtil.toMap(decompositionOrderSourceDictModels, DictModel::getValue, DictModel::getText);
         Map<String, ProcessProjectAssessTerm> splitInfoIdMap = processProjectAssessTermService.getSplitInfoIdMap(assessmentId);
         List<ProcessProjectAssessTerm> allProjectAssesTermList = new ArrayList<>();
         List<String> usedSplitInfoId = new ArrayList<>();
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessTermService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessTermService.java
index 36a09bfb..2b523048 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessTermService.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessTermService.java
@@ -77,7 +77,7 @@ public class ProcessProjectAssessTermService extends ServiceImpl<ProcessProjectA
     public List<ProcessProjectAssessTerm> getByStandardsEngineer(String assessmentId) {
         LambdaQueryWrapper<ProcessProjectAssessTerm> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(ProcessProjectAssessTerm::getAssessmentId,assessmentId);
-        //wrapper.eq(ProcessProjectAssessTerm::getCanAssignFlag, YesOrNoEnum.YES.getInteger());
+        wrapper.eq(ProcessProjectAssessTerm::getCanAssignFlag, YesOrNoEnum.YES.getInteger());
         List<ProcessProjectAssessTerm> list = this.list(wrapper);
         return list;
     }