From d1d088a74ca7f8385e28625ee81d0ccf1c948b95 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Fri, 10 Jun 2022 14:45:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=BA=93=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6-=E6=A0=87=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BussDocumentLibraryEOServiceImpl.java     | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 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 4ceafe396..2edbf2b5d 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
@@ -455,13 +455,27 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                 }
             } else {
                 fieldList = fieldList.stream().filter(e -> YesOrNoEnum.YES.getValue().equals(String.valueOf(e.getIsQuery()))).collect(Collectors.toList());
+                if(CutEnum.CN.getValue().equals(cut)){
+                    fieldList = fieldList.stream().filter(e->!"title_en".equals(e.getDbFieldName())).collect(Collectors.toList());
+                }else{
+                    fieldList = fieldList.stream().filter(e->!"title".equals(e.getDbFieldName())).collect(Collectors.toList());
+                }
             }
-
         }
         //树形数据字典
         List<SysCategoryTreeVO> sysCategoryTree = sysCategoryService.getSysCategoryTree(null);
         List<Map<String, Object>> list = new ArrayList<>();
         for (OnlCgformField onlCgformField : fieldList) {
+            if(CutEnum.CN.getValue().equals(cut)){
+                if("title".equals(onlCgformField.getDbFieldName()) || "title_en".equals(onlCgformField.getDbFieldName())){
+                    onlCgformField.setDbFieldTxt("标题");
+                }
+            }else{
+                if("title".equals(onlCgformField.getDbFieldName()) || "title_en".equals(onlCgformField.getDbFieldName())){
+                    onlCgformField.setDbFieldEnName("Title");
+                }
+            }
+
             Map<String, Object> map = new HashMap<>();
             if ("technology_territory".equals(onlCgformField.getDbFieldName())) {
                 List<SysCategoryTreeVO> sysCategoryTreeVOList = sysCategoryTree.stream().filter(e -> onlCgformField.getDictId().equals(e.getDictId())).collect(Collectors.toList());
@@ -3548,11 +3562,12 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
 
     @NotNull
     private String getConditionStr(Map<String, Object> parameter) {
+        String cut = (String) parameter.get("cut");
         //查询条件
         StringBuilder conditionSb = new StringBuilder("where 1 = 1");
 
         //过滤查询条件字段类型使用
-        List<Map<String, Object>> mapList = queryCondition("1", null, null);
+        List<Map<String, Object>> mapList = queryCondition("1", cut, null);
 
         //查询条件处理
         for (Map.Entry<String, Object> entry : parameter.entrySet()) {