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>> getAddForm(@RequestParam(name="flag",required=true) String flag, - @RequestParam(name="cut",required=true) String cut) { - List> list = bussDocumentLibraryEOService.getAddForm(flag,cut); + @RequestParam(name="cut",required=true) String cut, + @RequestParam(name="type",required=true) String type) { + List> 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> getAddForm(String flag,String cut); + List> 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> getAddForm(String flag, String cut) { + public List> 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表单是否显示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> result = new ArrayList<>(); for (OnlCgformArea onlCgformAreaTemp : areaList) { @@ -1554,7 +1564,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl getWorkbookTitle(String cut) { - List> addForm = getAddForm(ModuleEnum.DOCUMENT_LIBRARY.getValue(), cut); + List> addForm = getAddForm(ModuleEnum.DOCUMENT_LIBRARY.getValue(), cut,"add"); StringBuilder sb = new StringBuilder(); List pullMoreList = new LinkedList<>();//多选字段 List pullSingleList = new LinkedList<>();//单选字段