From cdbb924989abea834396a6f17d69bb6530ee0756 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Thu, 23 Jun 2022 17:02:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=BA=93=E5=AF=BC=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BussDocumentLibraryEOServiceImpl.java     | 43 ++++++++++++++++---
 1 file changed, 36 insertions(+), 7 deletions(-)

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 fe6c9e3f8..c13a20acf 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
@@ -4974,9 +4974,20 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                              File saveDirectory,
                              String cut) {
         //树形数据字典
-        List<String> treeNameList = categoryList.stream().map(SysCategory::getName).collect(Collectors.toList());
+        List<String> treeNameList = new ArrayList<>();
+        if(CutEnum.CN.getValue().equals(cut)){
+            treeNameList = categoryList.stream().map(SysCategory::getName).collect(Collectors.toList());
+        }else{
+            treeNameList = categoryList.stream().map(SysCategory::getEnName).collect(Collectors.toList());
+        }
         //普通数据字典
-        List<String> itemNameList = dictItemList.stream().map(SysDictItem::getItemText).collect(Collectors.toList());
+        List<String> itemNameList = new ArrayList<>();
+        if(CutEnum.CN.getValue().equals(cut)){
+            itemNameList = dictItemList.stream().map(SysDictItem::getItemText).collect(Collectors.toList());
+        }else{
+            itemNameList = dictItemList.stream().map(SysDictItem::getEnName).collect(Collectors.toList());
+        }
+
         int i = 2;
         List<String> msgList = new ArrayList<>();
         List<Map<String, Object>> mapList = new ArrayList<>();
@@ -5074,11 +5085,18 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                             if (StringUtils.isNotBlank(value)) {
                                 for (String valueTemp : value.split(",")) {
                                     if (treeNameList.contains(valueTemp)) {
-                                        List<SysCategory> collect = categoryList.stream().filter(e -> e.getName().equals(valueTemp)).collect(Collectors.toList());
-                                        valueId += collect.get(0).getId();
+                                        List<SysCategory> collect = new ArrayList<>();
+                                        if(CutEnum.CN.getValue().equals(cut)){
+                                            collect = categoryList.stream().filter(e -> e.getName().equals(valueTemp)).collect(Collectors.toList());
+                                        }else{
+                                            collect = categoryList.stream().filter(e -> e.getEnName().equals(valueTemp)).collect(Collectors.toList());
+                                        }
+                                        valueId += collect.get(0).getId()+",";
                                     }
                                 }
-                                value = valueId;
+                                if(StringUtils.isNotBlank(valueId)){
+                                    value = valueId.substring(0, valueId.length() - 1);
+                                }
                             }
 
                         } else if (FieldTypeEnum.TEXT_STRING.getValue().equals(fieldShowType)) {
@@ -5150,7 +5168,12 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                             //文字转数据字典编码
                             if (itemNameList.contains(value)) {
                                 String finalValue = value;
-                                List<SysDictItem> collect = dictItemList.stream().filter(e -> StringUtils.isNotBlank(e.getItemText()) && e.getItemText().equals(finalValue)).collect(Collectors.toList());
+                                List<SysDictItem> collect = new ArrayList<>();
+                                if(CutEnum.CN.getValue().equals(cut)){
+                                    collect = dictItemList.stream().filter(e -> StringUtils.isNotBlank(e.getItemText()) && e.getItemText().equals(finalValue)).collect(Collectors.toList());
+                                }else{
+                                    collect = dictItemList.stream().filter(e -> StringUtils.isNotBlank(e.getEnName()) && e.getEnName().equals(finalValue)).collect(Collectors.toList());
+                                }
                                 if (collect.size() != 0) {
                                     value = collect.get(0).getItemValue();
                                 }
@@ -5193,7 +5216,13 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                             if (StringUtils.isNotBlank(value)) {
                                 for (String valueTemp : value.split(",")) {
                                     if (itemNameList.contains(valueTemp)) {
-                                        List<SysDictItem> collect = dictItemList.stream().filter(e -> StringUtils.isNotBlank(e.getItemText()) && e.getItemText().equals(valueTemp)).collect(Collectors.toList());
+                                        List<SysDictItem> collect = new ArrayList<>();
+                                        if(CutEnum.CN.getValue().equals(cut)){
+                                            collect = dictItemList.stream().filter(e -> StringUtils.isNotBlank(e.getItemText()) && e.getItemText().equals(valueTemp)).collect(Collectors.toList());
+                                        }else{
+                                            collect = dictItemList.stream().filter(e -> StringUtils.isNotBlank(e.getEnName()) && e.getEnName().equals(valueTemp)).collect(Collectors.toList());
+                                        }
+
                                         valueId += collect.get(0).getItemValue() + ",";
                                     }
                                 }