From ce68dd3e32877d786f878657b464be4a488bb245 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期一, 17 七月 2023 14:17:59 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs

---
 Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/UBCSSqlKeyword.java |    5 +++--
 1 files changed, 3 insertions(+), 2 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..809d0f4 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
@@ -109,8 +109,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