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 efb3f0e09..b8df7da10 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 @@ -5531,42 +5531,40 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl 1){ - sb.append(" "+type + " "); + if(StringUtils.isNotBlank(val)) { + count++;//从第二个查询条件开始拼接type(and或or) + if (count > 1) { + sb.append(" " + type + " "); } sb.append(" " + field + " "); //查询类型 String ruleTemp = queryType(rule); - if(StringUtils.isNotBlank(ruleLike)){ + if (StringUtils.isNotBlank(ruleLike)) { sb.append(ruleLike + " "); - }else{ + } else { sb.append(ruleTemp + " "); } - //在..中(用in-->特殊处理) - if(val.contains(",")){ - StringBuilder sbTemp = new StringBuilder(); - for (String valTemp : val.split(",")) { - sbTemp.append("'" + valTemp +"' ,"); - } - if(StringUtils.isNotBlank(sbTemp)){ - String substring = sbTemp.substring(0, sbTemp.length() - 1); - sb.append("("+substring+")"); - } - }else{ - //like和in需要特殊处理 - if(QueryRuleEnum.IN.getCondition().equals(rule)){ - sb.append("('" + val + "')"); - }else if(QueryRuleEnum.LIKE.getCondition().equals(rule)){ - sb.append("'%" + val + "%'"); - }else if(QueryRuleEnum.LEFT_LIKE.getCondition().equals(rule)){ - sb.append("'%" + val + "'"); - }else if(QueryRuleEnum.RIGHT_LIKE.getCondition().equals(rule)){ - sb.append("'" + val + "%'"); - }else{ - sb.append("'" + val + "'"); + //like和in需要特殊处理 + if (QueryRuleEnum.IN.getCondition().equals(rule)) { + if (val.contains(",")) { + StringBuilder sbTemp = new StringBuilder(); + for (String valTemp : val.split(",")) { + sbTemp.append("'" + valTemp + "' ,"); + } + if (StringUtils.isNotBlank(sbTemp)) { + String substring = sbTemp.substring(0, sbTemp.length() - 1); + sb.append("(" + substring + ")"); + } } + sb.append("('" + val + "')"); + } else if (QueryRuleEnum.LIKE.getCondition().equals(rule)) { + sb.append("'%" + val + "%'"); + } else if (QueryRuleEnum.LEFT_LIKE.getCondition().equals(rule)) { + sb.append("'%" + val + "'"); + } else if (QueryRuleEnum.RIGHT_LIKE.getCondition().equals(rule)) { + sb.append("'" + val + "%'"); + } else { + sb.append("'" + val + "'"); } } }