From 7416239a0781cbd1614f862e647e58466955110e Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Tue, 1 Mar 2022 16:42:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=BA=93--=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E8=A1=A8=E5=8D=95=E4=B8=AD=E7=A7=BB=E5=87=BA=E8=A2=AB=E4=BB=A3?=
 =?UTF-8?q?=E6=9B=BF=E6=A0=87=E5=87=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BussDocumentLibraryEOController.java         |  5 +++--
 .../service/IBussDocumentLibraryEOService.java   |  2 +-
 .../impl/BussDocumentLibraryEOServiceImpl.java   | 16 +++++++++++++---
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/controller/BussDocumentLibraryEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/controller/BussDocumentLibraryEOController.java
index a86032ff2..77b53c2e6 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/controller/BussDocumentLibraryEOController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/controller/BussDocumentLibraryEOController.java
@@ -251,8 +251,9 @@ public class BussDocumentLibraryEOController extends JeroController<BussDocument
 	 @ApiOperation(value="文档库信息表-新增表单", notes="文档库信息表-新增表单")
 	 @GetMapping(value = "/getAddForm")
 	 public Result<List<Map<String,Object>>> getAddForm(@RequestParam(name="flag",required=true) String flag,
-														@RequestParam(name="cut",required=true) String cut) {
-		 List<Map<String, Object>> list = bussDocumentLibraryEOService.getAddForm(flag,cut);
+														@RequestParam(name="cut",required=true) String cut,
+														@RequestParam(name="type",required=true) String type) {
+		 List<Map<String, Object>> list = bussDocumentLibraryEOService.getAddForm(flag,cut,type);
 		 return Result.OK(list);
 	 }
 
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/IBussDocumentLibraryEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/IBussDocumentLibraryEOService.java
index c2f13629b..66e283a15 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/IBussDocumentLibraryEOService.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/IBussDocumentLibraryEOService.java
@@ -68,7 +68,7 @@ public interface IBussDocumentLibraryEOService extends IService<BussDocumentLibr
 	 *
 	 * @return
 	 */
-	List<Map<String,Object>> getAddForm(String flag,String cut);
+	List<Map<String,Object>> getAddForm(String flag,String cut,String type);
 
 	/**
 	 * 编辑数据查询
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 6394e4b7d..d8e5a7e13 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
@@ -236,7 +236,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
      * @return
      */
     @Override
-    public List<Map<String, Object>> getAddForm(String flag, String cut) {
+    public List<Map<String, Object>> getAddForm(String flag, String cut,String type) {
         OnlCgformArea onlCgformArea = new OnlCgformArea();
         onlCgformArea.setIsModel(ModuleEnum.DOCUMENT_LIBRARY.getValue());
         //区域管理
@@ -246,7 +246,17 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
 
         if (fieldList.size() != 0) {
             //过滤出表单字段(is_show_form-->表单是否显示0否 1是)
-            fieldList = fieldList.stream().filter(e -> YesOrNoEnum.YES.getValue().equals(String.valueOf(e.getIsShowForm()))).collect(Collectors.toList());
+            if("add".equals(type)){
+                //新增时,被代替标准在表单中不显示
+                fieldList = fieldList.stream()
+                        .filter(e -> YesOrNoEnum.YES.getValue().equals(String.valueOf(e.getIsShowForm())) && !e.getDbFieldName().equals("replaced_standard"))
+                        .collect(Collectors.toList());
+            }else{
+                fieldList = fieldList.stream()
+                        .filter(e -> YesOrNoEnum.YES.getValue().equals(String.valueOf(e.getIsShowForm())))
+                        .collect(Collectors.toList());
+            }
+
         }
         List<Map<String, Object>> result = new ArrayList<>();
         for (OnlCgformArea onlCgformAreaTemp : areaList) {
@@ -1554,7 +1564,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
      * @return
      */
     private List<String> getWorkbookTitle(String cut) {
-        List<Map<String, Object>> addForm = getAddForm(ModuleEnum.DOCUMENT_LIBRARY.getValue(), cut);
+        List<Map<String, Object>> addForm = getAddForm(ModuleEnum.DOCUMENT_LIBRARY.getValue(), cut,"add");
         StringBuilder sb = new StringBuilder();
         List<String> pullMoreList = new LinkedList<>();//多选字段
         List<String> pullSingleList = new LinkedList<>();//单选字段