Kaynağa Gözat

fix新增和下一步选人

LLL 1 yıl önce
ebeveyn
işleme
344f815d5c

+ 8 - 2
itdmServer/module-iTDM/src/main/java/org/jeecg/modules/flowpath/controller/ItdmRunFlowPathStepController.java

@@ -16,6 +16,8 @@ import org.jeecg.modules.flowpath.service.IItdmFlowPathStepService;
 import org.jeecg.modules.flowpath.service.IItdmRunFlowPathStepService;
 import org.jeecg.modules.flowpath.vo.ItdmBuohuiRunFlowPathStepVO;
 import org.jeecg.modules.flowpath.vo.NextStepUserVO;
+import org.jeecg.modules.system.entity.SysUser;
+import org.jeecg.modules.system.service.ISysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -38,6 +40,8 @@ public class ItdmRunFlowPathStepController extends JeecgController<ItdmRunFlowPa
 	private IItdmRunFlowPathStepService itdmRunFlowPathStepService;
 	@Autowired
 	private IItdmFlowPathStepService flowPathStepService;
+	@Autowired
+	private ISysUserService sysUserService;
 
 	 /**
       * 分页列表查询
@@ -103,7 +107,8 @@ public class ItdmRunFlowPathStepController extends JeecgController<ItdmRunFlowPa
 		 List<NextStepUserVO> list1 = list.stream().map(i->{
 			 NextStepUserVO vo = new NextStepUserVO();
 			 vo.setUserName(i);
-			 vo.setRealName(i);
+			 SysUser sysUser = sysUserService.getUserByName(i);
+			 if(sysUser != null) vo.setRealName(sysUser.getRealname());
 			 return vo;
 		 }).collect(Collectors.toList());
 		 return list1;
@@ -118,7 +123,8 @@ public class ItdmRunFlowPathStepController extends JeecgController<ItdmRunFlowPa
 		 List<NextStepUserVO> list1 = list.stream().map(i->{
 			 NextStepUserVO vo = new NextStepUserVO();
 			 vo.setUserName(i);
-			 vo.setRealName(i);
+			 SysUser sysUser = sysUserService.getUserByName(i);
+			 if(sysUser != null) vo.setRealName(sysUser.getRealname());
 			 return vo;
 		 }).collect(Collectors.toList());
 		 return list1;