From 43f5950aa4df14dea62944783f26736008406a1b Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Mon, 28 Feb 2022 17:04:47 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=BA=93--=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E5=B1=9E=E6=80=A7=E6=9F=A5=E8=AF=A2=E6=B7=BB=E5=8A=A0=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E6=A0=87=E8=AF=86=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../online/cgform/mapper/xml/OnlCgformFieldMapper.xml     | 2 +-
 .../cgform/service/impl/OnlCgformFieldServiceImpl.java    | 2 +-
 .../service/impl/BussDocumentLibraryEOServiceImpl.java    | 8 +++++++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/mapper/xml/OnlCgformFieldMapper.xml b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/mapper/xml/OnlCgformFieldMapper.xml
index 3a3a39d74..c4c631f97 100644
--- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/mapper/xml/OnlCgformFieldMapper.xml
+++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/mapper/xml/OnlCgformFieldMapper.xml
@@ -123,7 +123,7 @@
 	<select id="getFieldList" resultType="com.jero.generater.modules.online.cgform.entity.OnlCgformField">
 		select * from onl_cgform_field ocf
 		left join onl_cgform_head och on ocf.cgform_head_id = och.id
-		where table_name =#{tableName}
+		where table_name =#{tableName} and is_delete = 0
 		order by order_num asc
 	</select>
 
diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/service/impl/OnlCgformFieldServiceImpl.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/service/impl/OnlCgformFieldServiceImpl.java
index f294f26ae..9a978c0c8 100644
--- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/service/impl/OnlCgformFieldServiceImpl.java
+++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/service/impl/OnlCgformFieldServiceImpl.java
@@ -815,7 +815,7 @@ public class OnlCgformFieldServiceImpl extends ServiceImpl<OnlCgformFieldMapper,
     public List<OnlCgformField> getFieldList(String flag){
         List<OnlCgformField> fieldList = new ArrayList<>();
         if(ModuleEnum.DOCUMENT_LIBRARY.getValue().equals(flag)){
-            fieldList = onlCgformFieldMapper.getFieldList(TableEnum.BUSS_DOCUMENT_LIBRARY.getTable());
+            fieldList = onlCgformFieldMapper.getFieldList(TableEnum.BUSS_DOCUMENT_LIBRARY.getTable()+" ");
         }else if(ModuleEnum.OCR_RECORD.getValue().equals(flag)){
             fieldList = onlCgformFieldMapper.getFieldList(TableEnum.OCR_RECORD.getTable());
         }else if(ModuleEnum.ONL_CGFORM_TAG.getValue().equals(flag)){
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 f4c0beeb9..7977fbf59 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
@@ -249,10 +249,16 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
         }
         List<Map<String, Object>> result = new ArrayList<>();
         for (OnlCgformArea onlCgformAreaTemp : areaList) {
+            String areaName = "";
+            if(CutEnum.CN.getValue().equals(cut)){
+                areaName = onlCgformAreaTemp.getShowArea();
+            }else{
+                areaName = onlCgformAreaTemp.getEnName();
+            }
             List<OnlCgformField> fieldListTemp = fieldList.stream().filter(e -> onlCgformAreaTemp.getId().equals(e.getShowArea())).collect(Collectors.toList());
             for (OnlCgformField onlCgformField : fieldListTemp) {
                 Map<String, Object> map = new HashMap<>();
-                mapPut(cut, map, "field_show_type", onlCgformField.getFieldShowType(), "dict_field", onlCgformField.getDictField(), "db_field_name", onlCgformField.getDbFieldName(), "db_field_txt", onlCgformField.getDbFieldTxt(), "db_field_en_name", onlCgformField.getDbFieldEnName(), "area", onlCgformAreaTemp.getShowArea());
+                mapPut(cut, map, "field_show_type", onlCgformField.getFieldShowType(), "dict_field", onlCgformField.getDictField(), "db_field_name", onlCgformField.getDbFieldName(), "db_field_txt", onlCgformField.getDbFieldTxt(), "db_field_en_name", onlCgformField.getDbFieldEnName(), "area", areaName);
                 map.put("field_must_input", onlCgformField.getFieldMustInput());//区域
                 result.add(map);
             }