From c6ea88d53f5b1133b353eb83a36fa1ea6941c3b3 Mon Sep 17 00:00:00 2001
From: DouDou <877258667@qq.com>
Date: Mon, 23 Dec 2024 10:33:44 +0800
Subject: [PATCH] =?UTF-8?q?IFS=20jar=20=E6=B5=8B=E8=AF=95=E5=BC=80?=
 =?UTF-8?q?=E5=8F=91=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/spring/ifs/api/BaseSearchApi.java    | 10 +++++-----
 .../java/com/spring/ifs/api/BaseSearchApiTest.java     |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/spring/ifs/api/BaseSearchApi.java b/src/main/java/com/spring/ifs/api/BaseSearchApi.java
index 8254ca80..3f1f37fe 100644
--- a/src/main/java/com/spring/ifs/api/BaseSearchApi.java
+++ b/src/main/java/com/spring/ifs/api/BaseSearchApi.java
@@ -59,7 +59,7 @@ public class BaseSearchApi {
         RecordCollection recordCollection = IfsPlsqlUtils.execSqlSearchGetRecordCollection(srv, searchSql, inParam);
         //判断能否返回
         if (recordCollection == null) {
-            return null;
+            return new ArrayList<>();
         } else {
             List<WorkCenterVo> resultItems = new ArrayList<>();
             //调用通用的处理方法  返回Map
@@ -129,7 +129,7 @@ public class BaseSearchApi {
         RecordCollection recordCollection = IfsPlsqlUtils.execSqlSearchGetRecordCollection(srv, searchSql, inParam);
         //判断能否返回
         if (recordCollection == null) {
-            return null;
+            return new ArrayList<>();
         } else {
             List<LocationInformationVo> resultItems = new ArrayList<>();
             //调用通用的处理方法  返回Map
@@ -237,7 +237,7 @@ public class BaseSearchApi {
         //设置查询的入参
         Map<String, String> inParam = new HashMap<>();
         if(!(null == ifsRowVersion || "".equals(ifsRowVersion))) {
-            searchSql.append(" AND pc.OBJVERSION >= :ifsRowVersion");
+            searchSql.append(" WHERE pc.OBJVERSION >= :ifsRowVersion");
             inParam.put("ifsRowVersion", ifsRowVersion);
         }
         //添加排序语句
@@ -248,7 +248,7 @@ public class BaseSearchApi {
         RecordCollection recordCollection = IfsPlsqlUtils.execSqlSearchGetRecordCollection(srv, searchSql, inParam);
         //判断能否返回
         if (recordCollection == null) {
-            return null;
+            return new ArrayList<>();
         } else {
             List<PartCatalog> resultItems = new ArrayList<>();
             //调用通用的处理方法  返回Map
@@ -307,7 +307,7 @@ public class BaseSearchApi {
         RecordCollection recordCollection = IfsPlsqlUtils.execSqlSearchGetRecordCollection(srv, searchSql, inParam);
         //判断能否返回
         if (recordCollection == null) {
-            return null;
+            return new ArrayList<>();
         } else {
             List<InventoryPartUnitCostSumVo> resultItems = new ArrayList<>();
             //调用通用的处理方法  返回Map
diff --git a/src/main/java/com/spring/ifs/api/BaseSearchApiTest.java b/src/main/java/com/spring/ifs/api/BaseSearchApiTest.java
index 34988e3b..9b2c2f8c 100644
--- a/src/main/java/com/spring/ifs/api/BaseSearchApiTest.java
+++ b/src/main/java/com/spring/ifs/api/BaseSearchApiTest.java
@@ -242,7 +242,7 @@ public class BaseSearchApiTest {
         RecordCollection recordCollection = IfsPlsqlUtils.execSqlSearchGetRecordCollection(srv, searchSql, inParam);
         //判断能否返回
         if (recordCollection == null) {
-            return null;
+            return new ArrayList<>();
         } else {
             List<PartCatalog> resultItems = new ArrayList<>();
             //调用通用的处理方法  返回Map