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 | 23 +++++++++++------------
1 files changed, 11 insertions(+), 12 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 e0f03ea..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
@@ -287,19 +287,18 @@
return R.fail(-1, sqlStr + "\\n 查询条件错误，请检查规则设置");
}
- return R.data(sqlStr);
-// Integer ret = 0;
-// try {
-// ret = qualityManageService.addQualityManage(id, varStr, sqlStr);
-// } catch (Exception e) {
-// e.printStackTrace();
-// log.info("查询条件错误，请检查规则设置......：", sqlStr);
-// } finally {
-// log.info("执行完成......：");
-// }
+ Integer ret = 0;
+ try {
+ ret = qualityManageService.addQualityManage(id, varStr, sqlStr);
+ } catch (Exception e) {
+ e.printStackTrace();
+ log.info("查询条件错误，请检查规则设置......：", sqlStr);
+ } finally {
+ log.info("执行完成......：");
+ }
- // 执行sql
-// return R.data(ret);
+// 执行sql
+ return R.data(ret);
}
}
--
Gitblit v1.9.3