From b642788dda56b058e2a4c40a9c43e29a5db85865 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期一, 14 八月 2023 09:35:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/UBCSSqlKeyword.java | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/UBCSSqlKeyword.java b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/UBCSSqlKeyword.java
index 7a2fbf4..d755111 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/UBCSSqlKeyword.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/UBCSSqlKeyword.java
@@ -3,10 +3,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.enums.SqlKeyword;
import com.baomidou.mybatisplus.core.enums.SqlLike;
-import com.baomidou.mybatisplus.core.toolkit.sql.SqlUtils;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
-import com.vci.ubcs.starter.web.util.VciDateUtil;
-import javafx.scene.input.DataFormat;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.core.tool.utils.StringUtil;
@@ -109,8 +106,9 @@
if (!Func.isEmpty(query)) {
query.forEach((k, v) -> {
- sb.append(" and ");
- if (!Func.hasEmpty(new Object[]{k, v}) && !k.endsWith("_ignore")) {
+
+ if (!Func.hasEmpty(new Object[]{k, v})) {
+ sb.append(" and ");
if (k.endsWith(LIKE)) {
sb.append(likeValueSqlwhere(getColumn(k,LIKE),v,SqlLike.DEFAULT));
} else if (k.endsWith(NOT_EQUAL)) {
--
Gitblit v1.9.3