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 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 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)) {