2022-08-26 化学品管控-化学品申购-采购申请，导出的数据当前和历史审批人信息不正确。

zd-modules/zd-chemical/src/main/java/com/zd/chemical/controller/ActHxpapplyController.java

@@ -1,8 +1,10 @@
 package com.zd.chemical.controller;
 
+import java.util.Collections;
 import java.util.List;
 import java.io.IOException;
 import java.util.Map;
+import java.util.Optional;
 import javax.servlet.http.HttpServletResponse;
 
 import com.zd.chemical.domain.vo.*;
@@ -113,6 +115,31 @@ public class ActHxpapplyController extends BaseController<ActHxpapply>
     public void export(HttpServletResponse response, ActHxpapplySearch actHxpapplySearch) throws IOException
     {
         List<ActHxpapplyListVo> list = actHxpapplyService.selectActHxpapplyList(actHxpapplySearch);
+        Optional.ofNullable(list).orElseGet(Collections::emptyList)
+                .stream()
+                .forEach(a->{
+                    StringBuffer currentApprover = new StringBuffer();
+                    Optional.ofNullable(a.getCurrentUserList()).orElseGet(Collections::emptyList)
+                            .stream()
+                            .forEach(b->{
+                                currentApprover.append(",");
+                                currentApprover.append(b.get("name"));
+                            });
+                    if(currentApprover.length()>0){
+                        a.setCurrentApprover(currentApprover.substring(1));
+                    }
+
+                    StringBuffer historyApprover = new StringBuffer();
+                    Optional.ofNullable(a.getHistoryUserList()).orElseGet(Collections::emptyList)
+                            .stream()
+                            .forEach(b->{
+                                historyApprover.append(",");
+                                historyApprover.append(b.get("name"));
+                            });
+                    if(historyApprover.length()>0){
+                        a.setHistoryApprover(historyApprover.substring(1));
+                    }
+                });
         ExcelUtil<ActHxpapplyListVo> util = new ExcelUtil<ActHxpapplyListVo>(ActHxpapplyListVo.class);
         util.exportExcel(response, list, "化学品申购数据");
     }