From a22d3fc41beaf3ceb9333066318b9c842d3bdae2 Mon Sep 17 00:00:00 2001
From: furongxin <419481438@qq.com>
Date: Mon, 8 Jul 2024 16:01:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E5=85=A5=E8=81=8C?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7=E6=9F=A5=E8=AF=A2=E5=80=9F=E5=8F=A3=EF=BC=8C?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=83=A8=E9=97=A8=E5=90=8D=E7=A7=B0=E3=80=81?=
 =?UTF-8?q?=E5=B2=97=E4=BD=8D=E5=90=8D=E7=A7=B0=E5=AD=97=E6=AE=B5=20?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E5=8F=91=E8=B5=B7=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E5=80=9F=E5=8F=A3=20=E4=B8=8D=E6=9F=A5=E8=AF=A2=E5=87=BA?=
 =?UTF-8?q?=E5=85=A5=E8=81=8C=E7=94=B3=E8=AF=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/definition/BpmProcessDefinitionController.java  | 2 +-
 .../bpm/controller/admin/oa/BpmOAEntryController.java     | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/BpmProcessDefinitionController.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/BpmProcessDefinitionController.java
index 1c9ab659..d027d876 100644
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/BpmProcessDefinitionController.java
+++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/BpmProcessDefinitionController.java
@@ -47,7 +47,7 @@ public class BpmProcessDefinitionController {
             BpmProcessDefinitionListReqVO listReqVO) {
 
         List<BpmProcessDefinitionRespVO> respVOS = bpmDefinitionService.getProcessDefinitionList(listReqVO);
-        respVOS = respVOS.stream().filter(data -> !data.getId().contains("work_task")).collect(Collectors.toList());
+        respVOS = respVOS.stream().filter(data -> !data.getId().contains("work_task") && !data.getId().contains("oa_entry")).collect(Collectors.toList());
         return success(respVOS);
     }
 
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/BpmOAEntryController.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/BpmOAEntryController.java
index b1783c76..b02819a9 100644
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/BpmOAEntryController.java
+++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/BpmOAEntryController.java
@@ -65,7 +65,13 @@ public class BpmOAEntryController {
 
         BpmOAEntryDO entry = entryService.getEntry(id);
 
-        return success(BpmOAEntryConvert.INSTANCE.convert(entry));
+        BpmOAEntryRespVO respVO = BpmOAEntryConvert.INSTANCE.convert(entry);
+        // 设备部门名称
+        respVO.setEntryDeptName(getDept(entry.getEntryDeptId()).getName());
+        // 设备岗位名称
+        respVO.setEntryPostName(getPost(entry.getEntryPostId()).getName());
+
+        return success(respVO);
     }
 
     @GetMapping("/getByOpenId")