From 8ea0f39d1c072e1f3ab9970be110bca212773848 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 04 Mar 2024 08:48:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/feign/RulesClient.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/feign/RulesClient.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/feign/RulesClient.java
index e9cef93..b0f1edf 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/feign/RulesClient.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/feign/RulesClient.java
@@ -238,7 +238,7 @@
} else if (rc.getRelation().equals("OR")) {
relation = " OR ";
} else {
- relation = " WHERE ";
+ relation = " WHERE (";
}
sqlStr += relation + getPropSqlStr(rc.getBasic());
@@ -270,11 +270,13 @@
}
+ sqlStr += ")";
+
varStr = "concat(" + varStr +") AS val";
if (StringUtil.isNotBlank(rules.getIsGate())) {
- String gateStr = rules.getIsGate().equals("1") ?"'有闸水库'":"'无闸水库'";
+ String gateStr = rules.getIsGate().equals("1") ?"'有闸控制'":"'无闸控制'";
sqlStr += " and a.\"is_gate\" = " + gateStr;
}
@@ -284,6 +286,7 @@
log.info("查询条件错误，请检查规则设置......：", sqlStr);
return R.fail(-1, sqlStr + "\\n 查询条件错误，请检查规则设置");
}
+
Integer ret = 0;
try {
@@ -295,7 +298,7 @@
log.info("执行完成......：");
}
- // 执行sql
+// 执行sql
return R.data(ret);
}
}
--
Gitblit v1.9.3