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 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 resultItems = new ArrayList<>(); //调用通用的处理方法 返回Map @@ -237,7 +237,7 @@ public class BaseSearchApi { //设置查询的入参 Map 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 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 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 resultItems = new ArrayList<>(); //调用通用的处理方法 返回Map