From f4d5e1b497bb02c13f8307d1b3ed854b45eb664b Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Mon, 23 May 2022 16:05:48 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=BA=93--=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA(=E6=A0=87=E9=A2=98)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BussDocumentLibraryEOServiceImpl.java     | 24 ++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
index 208c6412b..e40beb09a 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
@@ -488,13 +488,31 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
     public List<Map<String, Object>> getHeader(String flag, String cut, String searchFlag) {
         List<OnlCgformField> fieldList = onlCgformFieldService.getFieldList(flag);
         if (fieldList.size() != 0) {
+            String titleEn = "";
             //过滤列表字段(is_show_list-->列表是否显示0否 1是)
             if ("search".equals(searchFlag)) {
                 fieldList = fieldList.stream().filter(e -> YesOrNoEnum.YES.getValue().equals(String.valueOf(e.getIsShowSearch()))).collect(Collectors.toList());
             } else {
-                fieldList = fieldList.stream().filter(e -> YesOrNoEnum.YES.getValue().equals(String.valueOf(e.getIsShowList()))).collect(Collectors.toList());
+                for (OnlCgformField onlCgformField : fieldList) {
+                    if(CutEnum.EN.getValue().equals(cut) && "title_en".equals(onlCgformField.getDbFieldName())){
+                        titleEn = onlCgformField.getDbFieldEnName();
+                        break;
+                    }
+                }
+                for (OnlCgformField onlCgformField : fieldList) {
+                    if(CutEnum.EN.getValue().equals(cut) && "title".equals(onlCgformField.getDbFieldName())){
+                        onlCgformField.setDbFieldEnName(titleEn);
+                        break;
+                    }
+                }
+                fieldList = fieldList.stream()
+                        .filter(e -> YesOrNoEnum.YES.getValue().equals(String.valueOf(e.getIsShowList()))
+                        && !"title_en".equals(e.getDbFieldName()))
+                        .collect(Collectors.toList());
             }
         }
+        //过滤掉英文标题字段
+
         List<Map<String, Object>> list = new ArrayList<>();
         for (OnlCgformField onlCgformField : fieldList) {
             Map<String, Object> map = new HashMap<>();
@@ -3015,6 +3033,10 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
         List<String> idList = new ArrayList<>();
         List<String> fileIdLidt = new ArrayList<>();
         for (Map record : records) {
+            //处理标题
+            if(CutEnum.EN.getValue().equals(cut)){
+                record.put("title",record.get("title_en"));
+            }
             Map<String, Object> record1 = (Map) record;
             idList.add((String) record1.get("id"));
             for (Map.Entry<String, Object> entry : record1.entrySet()) {