From 390eb925034c3f6dea83fc7ce2378ea40a93053d Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Thu, 06 Jul 2023 11:10:27 +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 |   33 +++++++++++++++++----------------
 1 files changed, 17 insertions(+), 16 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 e08c100..071f75e 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
@@ -61,40 +61,40 @@
 		String retStr = "-1";
 		switch (key) {
 			case "GREATER": //大于
-				retStr = " &gt; " + target;
+				retStr = " > " + target;
 				break;
 			case "GREATER_EQUAL": //大于等于
-				retStr = " &gt;= " + target;
+				retStr = " >= " + target;
 				break;
 			case "EQUAL": //等于
 				retStr = " = " + target;
 				break;
 			case "LESS_EQUAL": //小于等于
-				retStr = " &lt;= " + target;
+				retStr = " <= " + target;
 				break;
 			case "LESS":  //小于
-				retStr = " &lt; " + target;
+				retStr = " < " + target;
 				break;
 			case "UNEQUAL": //不等于
-				retStr = " &lt;&gt; " + target;
+				retStr = " <> " + target;
 				break;
 			case "DIFFER_GRATER": //差值大于
-				retStr = " - " + target + " &gt; " + val;
+				retStr = " - " + target + " > " + val;
 				break;
 			case "DIFFER_GRATER_EQUAL": //差值大于等于
-				retStr = " - " + target + " &gt;= " + val;
+				retStr = " - " + target + " >= " + val;
 				break;
 			case "DIFFER_EQUAL": //差值等于
 				retStr = " - " + target + " = " + val;
 				break;
 			case "DIFFER_LESS_EQUAL": //差值小于等于
-				retStr = " - " + target + " &lt; " + val;
+				retStr = " - " + target + " < " + val;
 				break;
 			case "DIFFER_LESS": //差值小于
-				retStr = " - " + target + " &lt;= " + val;
+				retStr = " - " + target + " <= " + val;
 				break;
 			case "DIFFER_UNEQUAL": //差值不等于
-				retStr = " - " + target + " &lt;&gt; " + val;
+				retStr = " - " + target + " <> " + val;
 				break;
 		}
 		return retStr;
@@ -110,22 +110,22 @@
 		String retStr = "-1";
 		switch (key) {
 			case "GREATER": //大于
-				retStr = " &gt; " + val;
+				retStr = " > " + val;
 				break;
 			case "GREATER_EQUAL": //大于等于
-				retStr = " &gt;= " + val;
+				retStr = " >= " + val;
 				break;
 			case "EQUAL": //等于
 				retStr = " = " + val;
 				break;
 			case "LESS_EQUAL": //小于等于
-				retStr = " &lt;= " + val;
+				retStr = " <= " + val;
 				break;
 			case "LESS":  //小于
-				retStr = " &lt; " + val;
+				retStr = " < " + val;
 				break;
 			case "UNEQUAL": //不等于
-				retStr = " &lt;&gt; " + val;
+				retStr = " <> " + val;
 				break;
 		}
 		return retStr;
@@ -221,7 +221,7 @@
 			} else if (rc.getRelation().equals("OR")) {
 				relation = " OR ";
 			} else {
-				relation = "";
+				relation = " WHERE ";
 			}
 
 			sqlStr += relation + getPropSqlStr(rc.getBasic());
@@ -237,6 +237,7 @@
 
 		}
 
+		// 拼接条件有问题，不操作
 		if (sqlStr.indexOf("-1") > 0) {
 			return R.fail(-1,sqlStr + "\\n 查询条件错误，请检查规则设置");
 		}

--
Gitblit v1.9.3