modify: 导出发起人改为和详情一致

yanxuan-qc-change-system-biz/src/main/java/com/netease/mail/yanxuan/change/biz/callback/ChangeFlowExportCallback.java

@@ -126,13 +126,21 @@ public class ChangeFlowExportCallback implements DesCallbackService {
         if (CollectionUtils.isEmpty(changeRecords)) {
             return Lists.newArrayList();
         }
-
         // 过滤不为供应商的创建人
         List<String> creatorList = changeRecords.stream()
             .filter(c -> !CreateSourceEnum.TONG_ZHOU.getType().equals(c.getCreateSource()))
             .map(ChangeRecord::getCreator).collect(Collectors.toList());
-        HashMap<String, List<SecondaryDepartments>> orgMap = null;
+        List<String> allQueryDepartmentList = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(creatorList)) {
+            allQueryDepartmentList.addAll(creatorList);
+
+        }
+        List<String> changeCommanderList = changeRecords.stream().map(ChangeRecord::getChangeCommander).collect(Collectors.toList());
+        if (CollectionUtils.isNotEmpty(changeCommanderList)) {
+            allQueryDepartmentList.addAll(changeCommanderList);
+        }
+        HashMap<String, List<SecondaryDepartments>> orgMap = null;
+        if (CollectionUtils.isNotEmpty(allQueryDepartmentList)) {
             // 查询创建人部门名
             IusDepartmentReq iusDepartmentReq = new IusDepartmentReq();
             iusDepartmentReq.setUids(new ArrayList<>(creatorList));
@@ -362,7 +370,6 @@ public class ChangeFlowExportCallback implements DesCallbackService {
             changeFlowExcelDTO.setChangeCreator(record.getCreateSupplier());
         } else {
             List<SecondaryDepartments> creator = orgMap.get(record.getCreator());
-            // 供应商查询不到数据，不会覆盖，展示供应商id
             if (!CollectionUtils.isEmpty(creator)) {
                 Optional<SecondaryDepartments> anyOrg = creator.stream().filter(o -> o.getOrgPosLevel() == 97).findAny();
                 String orgName = "无三级部门";
@@ -378,7 +385,15 @@ public class ChangeFlowExportCallback implements DesCallbackService {
         changeFlowExcelDTO.setChangeType(parentChangeType.getTypeName() + ">" + sonChangeType.getTypeName());
         changeFlowExcelDTO.setChangeLevel(ChangeLevelEnum.getByType(record.getChangeLevel()));
         changeFlowExcelDTO.setChangeDepartment(record.getChangeDepartment());
-        changeFlowExcelDTO.setChangeCommander(record.getChangeCommander());
+        List<SecondaryDepartments> commander = orgMap.get(record.getChangeCommander());
+        if (!CollectionUtils.isEmpty(commander)) {
+            Optional<SecondaryDepartments> anyOrg = commander.stream().filter(o -> o.getOrgPosLevel() == 97).findAny();
+            String orgName = "无三级部门";
+            if (anyOrg.isPresent()) {
+                orgName = anyOrg.get().getOrgPosName();
+            }
+            changeFlowExcelDTO.setChangeCommander(commander.get(0).getUserName() + "(" + orgName + ")");
+        }
         changeFlowExcelDTO.setChangeReason(record.getChangeReason());
         changeFlowExcelDTO.setChangeContent(record.getChangeContent());
         changeFlowExcelDTO.setChangeRiskDesc(record.getChangeRiskDesc());