From bc4a0f6635714c1c6dce3822543ef01fd2d8c47f Mon Sep 17 00:00:00 2001
From: wangliwen <wangliwen@hisense.com>
Date: Tue, 11 Oct 2022 19:48:06 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=82=E3=80=82=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TAbilityApplicationController.java        | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/renren-admin/src/main/java/io/renren/modules/processForm/controller/TAbilityApplicationController.java b/renren-admin/src/main/java/io/renren/modules/processForm/controller/TAbilityApplicationController.java
index e0e9555d..9368fd63 100644
--- a/renren-admin/src/main/java/io/renren/modules/processForm/controller/TAbilityApplicationController.java
+++ b/renren-admin/src/main/java/io/renren/modules/processForm/controller/TAbilityApplicationController.java
@@ -248,17 +248,6 @@ public class TAbilityApplicationController {
                     .map(tAbilityApplicationDTO -> resourceService.get(Long.valueOf(tAbilityApplicationDTO.getResourceId()))).collect(Collectors.toList());
             List<HistoryDetailDTO> taskHandleDetailInfo = activitiService.getTaskHandleDetailInfo(tAbilityApplicationDTOList.get(0).getInstanceId());
 
-            taskHandleDetailInfo = taskHandleDetailInfo.stream().map(index_ -> { // 补充审核人部门名称
-                if (StringUtils.isNumeric(index_.getAssignee())) {
-                    SysUserDTO userDTO = sysUserService.get(Long.valueOf(index_.getAssignee()));
-                    Optional<SysDeptDTO> sysDeptDTOOptional = Optional.ofNullable(sysDeptService.get(userDTO.getDeptId()));
-                    if (sysDeptDTOOptional.isPresent()) {
-                        index_.setAssigneeDeptName(sysDeptDTOOptional.get().getName());
-                    }
-                }
-                return index_;
-            }).collect(Collectors.toList());
-
             List<Object> camera;
             ArrayList cameraList = new ArrayList();
             QueryWrapper<TAbilityApplicationEntity> queryWrapper = new QueryWrapper<>();
@@ -313,6 +302,17 @@ public class TAbilityApplicationController {
                 }
             }
 
+            taskHandleDetailInfo = taskHandleDetailInfo.stream().map(index_ -> { // 补充审核人部门名称
+                if (StringUtils.isNumeric(index_.getAssignee())) {
+                    SysUserDTO userDTO = sysUserService.get(Long.valueOf(index_.getAssignee()));
+                    Optional<SysDeptDTO> sysDeptDTOOptional = Optional.ofNullable(sysDeptService.get(userDTO.getDeptId()));
+                    if (sysDeptDTOOptional.isPresent()) {
+                        index_.setAssigneeDeptName(sysDeptDTOOptional.get().getName());
+                    }
+                }
+                return index_;
+            }).collect(Collectors.toList());
+
             boolean finalBackToFirst = backToFirst;
             List<HistoryDetailDTO> finalTaskHandleDetailInfo = taskHandleDetailInfo;
             return new HashMap<String, Object>() {