From 8cd1efd41657f3f7e1314732b0fd0e798e1986a6 Mon Sep 17 00:00:00 2001
From: yjz <3131811435@qq.com>
Date: Wed, 17 Jan 2024 11:28:45 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E4=BC=81=E6=A0=87=E7=A8=BD=E6=9F=A5?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B):=20=E6=84=8F=E8=A7=81=E7=BF=BB=E8=AF=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProcessEsInspectPlanOpinionServiceImpl.java  | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

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<ProcessEsInspectPlanOpinionMapper, ProcessEsInspectPlanOpinion> 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<ProcessE
 	 */
 	@Override
     public void editById(ProcessEsInspectPlanOpinion processEsInspectPlanOpinion) {
-    	Date now = new Date();
+		Date now = new Date();
         processEsInspectPlanOpinion.setUpdateTime(now);
-    	saveOrUpdate(processEsInspectPlanOpinion);
+		saveOrUpdate(processEsInspectPlanOpinion);
     }
 
 	/**
@@ -144,6 +148,10 @@ public class ProcessEsInspectPlanOpinionServiceImpl extends ServiceImpl<ProcessE
 
 	@Override
 	public List<ProcessEsInspectPlanOpinion> findLastByGroup(String inspectPlanId) {
-		return processEsInspectPlanOpinionMapper.findLastByGroup(inspectPlanId);
+		List<ProcessEsInspectPlanOpinion> lastByGroup = processEsInspectPlanOpinionMapper.findLastByGroup(inspectPlanId);
+		for (ProcessEsInspectPlanOpinion processEsInspectPlanOpinion : lastByGroup) {
+			processEsInspectPlanOpinion.setCreateByDictText(sysUserService.dictByIdsOrUserNames("", processEsInspectPlanOpinion.getCreateBy()));
+		}
+		return lastByGroup;
 	}
 }