From 48f8469f81af55908828944d1a710477626e05d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Tue, 15 Oct 2024 14:50:31 +0800
Subject: [PATCH] =?UTF-8?q?sql=E9=87=87=E7=94=A8mybatis=E6=89=A7=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/FormulaRunServiceImpl.java   | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/com/engine/salary/service/impl/FormulaRunServiceImpl.java b/src/com/engine/salary/service/impl/FormulaRunServiceImpl.java
index 07c5ae633..075bd670a 100644
--- a/src/com/engine/salary/service/impl/FormulaRunServiceImpl.java
+++ b/src/com/engine/salary/service/impl/FormulaRunServiceImpl.java
@@ -1,5 +1,6 @@
 package com.engine.salary.service.impl;
 
+import cn.hutool.core.collection.CollectionUtil;
 import com.engine.core.impl.Service;
 import com.engine.salary.encrypt.AESEncryptUtil;
 import com.engine.salary.entity.datacollection.DataCollectionEmployee;
@@ -20,7 +21,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.math.NumberUtils;
 import org.springframework.util.StopWatch;
-import weaver.conn.RecordSet;
 import weaver.conn.RecordSetDataSource;
 import weaver.general.BaseBean;
 import weaver.general.Util;
@@ -43,7 +43,7 @@ public class FormulaRunServiceImpl extends Service implements FormulaRunService
 
     QlExpress express = new QlExpress();
 
-    private SQLMapper getSQLMapper(){
+    private SQLMapper getSQLMapper() {
         return MapperProxyFactory.getProxy(SQLMapper.class);
     }
 
@@ -129,17 +129,17 @@ public class FormulaRunServiceImpl extends Service implements FormulaRunService
                 }
             } else {
 
-//                List<Map> list = getSQLMapper().runSQL(sql);
-//                if(CollectionUtil.isNotEmpty(list)){
-//                    result =  Util.null2String(list.get(0).get(sqlReturnKey));
-//                }
-
-                RecordSet rs = new RecordSet();
-                if (rs.execute(sql)) {
-                    if (rs.next()) {
-                        result = rs.getString(sqlReturnKey);
-                    }
+                List<Map> list = getSQLMapper().runSQL(sql);
+                if (CollectionUtil.isNotEmpty(list)) {
+                    result = list.get(0) != null ? Util.null2String(list.get(0).get(sqlReturnKey)) : "";
                 }
+//
+//                RecordSet rs = new RecordSet();
+//                if (rs.execute(sql)) {
+//                    if (rs.next()) {
+//                        result = rs.getString(sqlReturnKey);
+//                    }
+//                }
             }
 
             if (OpenEnum.OPEN.getValue().equals(openDecrypt)) {