From 8cd1b34bca3fedbea0920d949c013d26f3f4e5c1 Mon Sep 17 00:00:00 2001
From: lijiaqi <lijq@ydool.com>
Date: Wed, 10 Jan 2024 14:23:56 +0800
Subject: [PATCH] update

---
 .../java/com/ydool/oa/workFlow/data/dto/WorkFlowDto.java   | 3 +++
 .../ydool/oa/workFlow/data/wrapper/WorkFlowWrapper.java    | 7 +++++++
 2 files changed, 10 insertions(+)

diff --git a/src/main/java/com/ydool/oa/workFlow/data/dto/WorkFlowDto.java b/src/main/java/com/ydool/oa/workFlow/data/dto/WorkFlowDto.java
index 899a562..c75f05d 100644
--- a/src/main/java/com/ydool/oa/workFlow/data/dto/WorkFlowDto.java
+++ b/src/main/java/com/ydool/oa/workFlow/data/dto/WorkFlowDto.java
@@ -48,6 +48,9 @@ public class WorkFlowDto extends WorkFlow {
     @ApiModelProperty(value = "是否能发起维修流程")
     private Boolean isRepair;
 
+    @ApiModelProperty(value = "部门名称")
+    private String deptName;
+
 
 
 }
diff --git a/src/main/java/com/ydool/oa/workFlow/data/wrapper/WorkFlowWrapper.java b/src/main/java/com/ydool/oa/workFlow/data/wrapper/WorkFlowWrapper.java
index 0603162..dc4b6f1 100644
--- a/src/main/java/com/ydool/oa/workFlow/data/wrapper/WorkFlowWrapper.java
+++ b/src/main/java/com/ydool/oa/workFlow/data/wrapper/WorkFlowWrapper.java
@@ -18,7 +18,9 @@ import com.ydool.oa.workFlow.enums.WorkFlowStepTypeEnum;
 import com.ydool.oa.workFlow.enums.WorkFlowTypeEnum;
 import com.ydool.oa.workFlow.service.WorkFlowStepLogService;
 import com.ydool.oa.workFlow.service.WorkFlowStepService;
+import com.ydool.system.entity.Dept;
 import com.ydool.system.entity.User;
+import com.ydool.system.service.impl.DeptServiceImpl;
 import com.ydool.system.service.impl.UserServiceImpl;
 import org.apache.ibatis.annotations.Param;
 import org.mapstruct.AfterMapping;
@@ -46,6 +48,11 @@ public interface WorkFlowWrapper extends BaseWrapper<WorkFlow, WorkFlowDto> {
         User user = userService.getById(obj.getUserId());
         if (ObjUtil.isNotNull(user)) {
             dto.setUserName(user.getUserName());
+            DeptServiceImpl deptService = SpringUtil.getBean(DeptServiceImpl.class);
+            Dept dept = deptService.getById(user.getDept());
+            if (ObjUtil.isNotNull(dept)) {
+                dto.setDeptName(dept.getName());
+            }
         }
 
         dto.setTypeName(WorkFlowTypeEnum.valueOf(obj.getType().toUpperCase()).getName());