From 5569ff5c185797bb159ea2c58a52a92815e18db9 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 13 六月 2023 19:51:16 +0800
Subject: [PATCH] code服务添加租户相关内容，角色配置界面修改
---
Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/UBCSSqlKeyword.java | 26 ++++++++++++--------------
1 files changed, 12 insertions(+), 14 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 e8db33a..3e45663 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
@@ -44,7 +44,7 @@
query.forEach((k, v) -> {
if (!Func.hasEmpty(new Object[]{k, v}) && !k.endsWith("_ignore")) {
if (k.endsWith("_like")) {
- qw.eq(getColumn(k, "_like"), v);
+ qw.like(getColumn(k, "_like"), v);
} else if (k.endsWith("_notequal")) {
qw.ne(getColumn(k, "_notequal"), v);
} else if (k.endsWith("_likeleft")) {
@@ -76,7 +76,7 @@
} else if (k.endsWith("_notnull")) {
qw.isNotNull(getColumn(k, "_notnull"));
} else {
- qw.like(getColumn(k, "_equal"), v);
+ qw.eq(getColumn(k, "_equal"), v);
}
}
@@ -88,8 +88,8 @@
if (!Func.isEmpty(query)) {
query.forEach((k, v) -> {
if (!Func.hasEmpty(new Object[]{k, v}) && !k.endsWith("_ignore")) {
- if (k.endsWith("_equal")) {
- qw.eq(getColumn(k, "_equal"), v);
+ if (k.endsWith("_like")) {
+ qw.like(getColumn(k, "_like"), v);
} else if (k.endsWith("_notequal")) {
qw.ne(getColumn(k, "_notequal"), v);
} else if (k.endsWith("_likeleft")) {
@@ -121,7 +121,7 @@
} else if (k.endsWith("_notnull")) {
qw.isNotNull(getColumn(k, "_notnull"));
} else {
- qw.like(getColumn(k, "_like"), v);
+ qw.eq(getColumn(k, "_equal"), v);
}
}
@@ -133,8 +133,8 @@
if (!Func.isEmpty(query)) {
query.forEach((k, v) -> {
if (!Func.hasEmpty(new Object[]{k, v}) && !k.endsWith("_ignore")) {
- if (k.endsWith("_equal")) {
- qw.eq(getColumn(k, "_equal"), v);
+ if (k.endsWith("_like")) {
+ qw.like(getColumn(k, "_like"), v);
} else if (k.endsWith("_notequal")) {
qw.ne(getColumn(k, "_notequal"), v);
} else if (k.endsWith("_likeleft")) {
@@ -166,7 +166,7 @@
} else if (k.endsWith("_notnull")) {
qw.isNotNull(getColumn(k, "_notnull"));
} else {
- qw.like(getColumn(k, "_like"), v);
+ qw.eq(getColumn(k, "_equal"), v);
}
}
@@ -178,8 +178,8 @@
if (!Func.isEmpty(query)) {
query.forEach((k, v) -> {
if (!Func.hasEmpty(new Object[]{k, v}) && !k.endsWith("_ignore")) {
- if (k.endsWith("_equal")) {
- qw.eq(getColumn(k, "_equal"), v);
+ if (k.endsWith("_like")) {
+ qw.like(getColumn(k, "_like"), v);
} else if (k.endsWith("_notequal")) {
qw.ne(getColumn(k, "_notequal"), v);
} else if (k.endsWith("_likeleft")) {
@@ -211,7 +211,7 @@
} else if (k.endsWith("_notnull")) {
qw.isNotNull(getColumn(k, "_notnull"));
} else {
- qw.like(getColumn(k, "_like"), v);
+ qw.eq(getColumn(k, "_equal"), v);
}
}
@@ -220,14 +220,12 @@
}
/**
- * 鐩墠鑰冭檻涓�绉嶇壒娈婃儏鍐碉紝鍦ㄥ仛杩炶〃鏌ヨ鐨勬椂鍊欙紝鍥犱负鏌ヨ鏉′欢鏄痬ap杞瑆rapper锛�
- * 杩欐牱灏变細鍑虹幇鏈槑纭畾涔夊垪鐨勯敊璇紝鎵�浠ラ渶瑕佽�冭檻鍦ㄤ綍澶勬潵鍋氬鐞嗭紝
+ * 鑾峰彇鍒楀悕锛屾病鏈夎浆涓嬪垝绾挎槧灏�
* @param column
* @param keyword
* @return
*/
private static String getColumn(String column, String keyword) {
-
//娌℃湁杞笅鍒掔嚎鏄犲皠
return StringUtil.removeSuffix(column, keyword).toLowerCase(Locale.ROOT);
}
--
Gitblit v1.9.3