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 e40beb09a..88ebd0a3f 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 @@ -3141,15 +3141,17 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl - List queryConditionVOList = (List) parameter.get("queryConditionVOList"); - if(ObjectUtils.isNotEmpty(queryConditionVOList)){ - String queryCondition = sqlJoint(queryConditionVOList); - if(StringUtils.isNotBlank(queryCondition)){ - conditionSb.append(queryCondition); + if(ObjectUtils.isNotEmpty(parameter.get("queryConditionVOList"))){ + String queryConditionVOListStr = (String) parameter.get("queryConditionVOList"); + List queryConditionVOList = JSONObject.parseArray(queryConditionVOListStr, QueryConditionVO.class); + if(ObjectUtils.isNotEmpty(queryConditionVOList)){ + String queryCondition = sqlJoint(queryConditionVOList); + if(StringUtils.isNotBlank(queryCondition)){ + conditionSb.append(" and " + queryCondition); + } } } - //处理列表表头排序 if (StringUtils.isNotBlank((String) parameter.get("orderByField"))) { conditionSb.append(" order by " + (String) parameter.get("orderByField")); @@ -5089,6 +5091,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl fieldListNew = new ArrayList<>(); fieldListNew.add("id"); @@ -5145,6 +5148,10 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl特殊处理) if(val.contains(",")){ StringBuilder sbTemp = new StringBuilder(); @@ -5162,10 +5173,21 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl 1){ sb.append(type + " ");