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 decompositionOrderSourceDictModels = sysBaseAPI.queryDictItemsByCode("decomposition_order_source"); - Map decompositionOrderSourceMap = CollStreamUtil.toMap(dictModels, DictModel::getValue, DictModel::getText); + Map decompositionOrderSourceMap = CollStreamUtil.toMap(decompositionOrderSourceDictModels, DictModel::getValue, DictModel::getText); Map splitInfoIdMap = processProjectAssessTermService.getSplitInfoIdMap(assessmentId); List allProjectAssesTermList = new ArrayList<>(); List 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 getByStandardsEngineer(String assessmentId) { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.eq(ProcessProjectAssessTerm::getAssessmentId,assessmentId); - //wrapper.eq(ProcessProjectAssessTerm::getCanAssignFlag, YesOrNoEnum.YES.getInteger()); + wrapper.eq(ProcessProjectAssessTerm::getCanAssignFlag, YesOrNoEnum.YES.getInteger()); List list = this.list(wrapper); return list; }