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 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 sysCategoryTree = sysCategoryService.getSysCategoryTree(null); List> 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 map = new HashMap<>(); if ("technology_territory".equals(onlCgformField.getDbFieldName())) { List sysCategoryTreeVOList = sysCategoryTree.stream().filter(e -> onlCgformField.getDictId().equals(e.getDictId())).collect(Collectors.toList()); @@ -3548,11 +3562,12 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl parameter) { + String cut = (String) parameter.get("cut"); //查询条件 StringBuilder conditionSb = new StringBuilder("where 1 = 1"); //过滤查询条件字段类型使用 - List> mapList = queryCondition("1", null, null); + List> mapList = queryCondition("1", cut, null); //查询条件处理 for (Map.Entry entry : parameter.entrySet()) {