diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/ProcessEsInspectPlanOpinionServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/ProcessEsInspectPlanOpinionServiceImpl.java index dcb06305..9b1e5994 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/ProcessEsInspectPlanOpinionServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/ProcessEsInspectPlanOpinionServiceImpl.java @@ -10,6 +10,7 @@ import com.jero.common.system.vo.LoginUser; import com.jero.modules.activiti.process.esinspectplan.entity.ProcessEsInspectPlanOpinion; import com.jero.modules.activiti.process.esinspectplan.mapper.ProcessEsInspectPlanOpinionMapper; import com.jero.modules.activiti.process.esinspectplan.service.IProcessEsInspectPlanOpinionService; +import com.jero.modules.system.service.ISysUserService; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.SecurityUtils; import org.jetbrains.annotations.NotNull; @@ -31,9 +32,12 @@ import java.util.List; public class ProcessEsInspectPlanOpinionServiceImpl extends ServiceImpl implements IProcessEsInspectPlanOpinionService { private final ProcessEsInspectPlanOpinionMapper processEsInspectPlanOpinionMapper; + private final ISysUserService sysUserService; - public ProcessEsInspectPlanOpinionServiceImpl(ProcessEsInspectPlanOpinionMapper processEsInspectPlanOpinionMapper) { + public ProcessEsInspectPlanOpinionServiceImpl(ProcessEsInspectPlanOpinionMapper processEsInspectPlanOpinionMapper, + ISysUserService sysUserService) { this.processEsInspectPlanOpinionMapper = processEsInspectPlanOpinionMapper; + this.sysUserService = sysUserService; } /** @@ -93,9 +97,9 @@ public class ProcessEsInspectPlanOpinionServiceImpl extends ServiceImpl findLastByGroup(String inspectPlanId) { - return processEsInspectPlanOpinionMapper.findLastByGroup(inspectPlanId); + List lastByGroup = processEsInspectPlanOpinionMapper.findLastByGroup(inspectPlanId); + for (ProcessEsInspectPlanOpinion processEsInspectPlanOpinion : lastByGroup) { + processEsInspectPlanOpinion.setCreateByDictText(sysUserService.dictByIdsOrUserNames("", processEsInspectPlanOpinion.getCreateBy())); + } + return lastByGroup; } }