diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectnotmet/service/ProcessProjectNotMetService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectnotmet/service/ProcessProjectNotMetService.java index 26d8e758..dab7c6af 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectnotmet/service/ProcessProjectNotMetService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectnotmet/service/ProcessProjectNotMetService.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.system.api.ISysBaseAPI; import com.jero.common.system.vo.DictModel; import com.jero.common.system.vo.LoginUser; +import com.jero.common.system.vo.SysDepartModel; import com.jero.modules.activiti.entity.ProcessAll; import com.jero.modules.activiti.entity.ProcessApprovalRecord; import com.jero.modules.activiti.enums.ProcessTypeEnum; @@ -89,6 +90,10 @@ public class ProcessProjectNotMetService extends ServiceImpl assessResultsDictModels = sysBaseAPI.queryDictItemsByCode("assess_results"); Map assessResultsDictMap = CollStreamUtil.toMap(assessResultsDictModels, DictModel::getValue, DictModel::getText); + List allSysDepart = sysBaseAPI.getAllSysDepart(); + Map departNameMap = CollStreamUtil.toMap(allSysDepart, SysDepartModel::getId, SysDepartModel::getDepartName); + + for (ProcessProjectNotMetLink processProjectNotMetLink : processProjectNotMetLinks) { String engineerId = processProjectNotMetLink.getEngineerId(); processProjectNotMetLink.setEngineerId_dictText(userNameMap.get(engineerId)); @@ -96,6 +101,8 @@ public class ProcessProjectNotMetService extends ServiceImpl