WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into master

Browse Source
This commit is contained in:
caoyang
2022-03-30 22:19:20 +08:00
parent 66ecd07c6e 470053c1a3
commit 08e891dfca
1 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
+20 -12
View File
@@ -1187,10 +1187,12 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
} }
for (OnlCgformField onlCgformField : searchFieldList) { for (OnlCgformField onlCgformField : searchFieldList) {
String s = (String) map.get(onlCgformField.getDbFieldName()); String s = (String) map.get(onlCgformField.getDbFieldName());
if (StringUtils.isBlank(s)) { // if (StringUtils.isBlank(s)) {
s = ""; // s = "";
// }
if(StringUtils.isNotBlank(s)){
stringMap.put(onlCgformField.getDbFieldName(), s);
} }
stringMap.put(onlCgformField.getDbFieldName(), s);
} }
stringMap.put("id", idTemp + ossFile.getId()); stringMap.put("id", idTemp + ossFile.getId());
@@ -1206,10 +1208,12 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
Map<String, Object> stringMap = new HashMap<>(); Map<String, Object> stringMap = new HashMap<>();
for (OnlCgformField onlCgformField : searchFieldList) { for (OnlCgformField onlCgformField : searchFieldList) {
String s = (String) map.get(onlCgformField.getDbFieldName()); String s = (String) map.get(onlCgformField.getDbFieldName());
if (StringUtils.isBlank(s)) { // if (StringUtils.isBlank(s)) {
s = ""; // s = "";
// }
if(StringUtils.isNotBlank(s)){
stringMap.put(onlCgformField.getDbFieldName(), s);
} }
stringMap.put(onlCgformField.getDbFieldName(), s);
} }
stringMap.put("id", idTemp); stringMap.put("id", idTemp);
stringMap.put("module_type", "文档库"); stringMap.put("module_type", "文档库");
@@ -1644,10 +1648,12 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
if(FieldTypeEnum.DATE_SINGLE.getValue().equals(onlCgformField.getFieldShowType()) && StringUtils.isNotBlank(s)){ if(FieldTypeEnum.DATE_SINGLE.getValue().equals(onlCgformField.getFieldShowType()) && StringUtils.isNotBlank(s)){
s = s.split(" ")[0]; s = s.split(" ")[0];
} }
if (StringUtils.isBlank(s)) { // if (StringUtils.isBlank(s)) {
s = ""; // s = "";
// }
if(StringUtils.isNotBlank(s)){
stringMap.put(onlCgformField.getDbFieldName(), s);
} }
stringMap.put(onlCgformField.getDbFieldName(), s);
} }
stringMap.put("id", (String) map.get("id") + ossFile.getId()); stringMap.put("id", (String) map.get("id") + ossFile.getId());
@@ -1666,10 +1672,12 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
if(FieldTypeEnum.DATE_SINGLE.getValue().equals(onlCgformField.getFieldShowType()) && StringUtils.isNotBlank(s)){ if(FieldTypeEnum.DATE_SINGLE.getValue().equals(onlCgformField.getFieldShowType()) && StringUtils.isNotBlank(s)){
s = s.split(" ")[0]; s = s.split(" ")[0];
} }
if (StringUtils.isBlank(s)) { // if (StringUtils.isBlank(s)) {
s = ""; // s = "";
// }
if(StringUtils.isNotBlank(s)){
stringMap.put(onlCgformField.getDbFieldName(), s);
} }
stringMap.put(onlCgformField.getDbFieldName(), s);
} }
stringMap.put("id", (String) map.get("id")); stringMap.put("id", (String) map.get("id"));
stringMap.put("module_type", "文档库"); stringMap.put("module_type", "文档库");