Merge remote-tracking branch 'origin/jtdev' into jtdev

guoshilong

2024-03-04 8ea0f39d1c072e1f3ab9970be110bca212773848

 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);
   }
}