diff --git a/src/main/java/com/chint/application/queryies/OrderQuery.java b/src/main/java/com/chint/application/queryies/OrderQuery.java index 2908aec5..f6a2943f 100644 --- a/src/main/java/com/chint/application/queryies/OrderQuery.java +++ b/src/main/java/com/chint/application/queryies/OrderQuery.java @@ -163,7 +163,8 @@ public class OrderQuery { Set employeeNoSet = routeOrders.stream().filter(it -> it.getApproveOrderNo() != null) .flatMap(it -> Stream.of(it.getUserId(), it.getApproveOrderNo().getCreator())) .collect(Collectors.toSet()); - Map userMap = userRepository.findByEmployeeNoIn(employeeNoSet) + List byEmployeeNoIn = userRepository.findByEmployeeNoIn(employeeNoSet); + Map userMap = byEmployeeNoIn .stream() .collect(Collectors.toMap(User::getEmployeeNo, Function.identity())); List orders = routeOrders diff --git a/src/main/java/com/chint/infrastructure/echo_framework/repository/AbstractGenericRepository.java b/src/main/java/com/chint/infrastructure/echo_framework/repository/AbstractGenericRepository.java index 12752f4f..6f67a834 100644 --- a/src/main/java/com/chint/infrastructure/echo_framework/repository/AbstractGenericRepository.java +++ b/src/main/java/com/chint/infrastructure/echo_framework/repository/AbstractGenericRepository.java @@ -149,7 +149,7 @@ public abstract class AbstractGenericRepository { } // Step 5: Return the complete list - return inCacheList; + return inCacheList.stream().filter(Objects::nonNull).collect(Collectors.toList()); } public List findByFieldsIn(String fieldPrefix, diff --git a/src/main/java/com/chint/interfaces/rest/data_center/user/BatchUserWorker.java b/src/main/java/com/chint/interfaces/rest/data_center/user/BatchUserWorker.java index 686681a4..89b3a6e5 100644 --- a/src/main/java/com/chint/interfaces/rest/data_center/user/BatchUserWorker.java +++ b/src/main/java/com/chint/interfaces/rest/data_center/user/BatchUserWorker.java @@ -247,6 +247,4 @@ public class BatchUserWorker { } return list.isEmpty(); } - - } diff --git a/src/test/java/com/chint/RouteApplicationTests.java b/src/test/java/com/chint/RouteApplicationTests.java index a0b8d092..1492d61a 100644 --- a/src/test/java/com/chint/RouteApplicationTests.java +++ b/src/test/java/com/chint/RouteApplicationTests.java @@ -313,9 +313,9 @@ class RouteApplicationTests { @Test void loginSign() { - String sfno = "221108016"; + String sfno = "230615020"; String syscode = "FSSC"; - String billcode = "CLSQ240620004123"; + String billcode = "CLSQ240225000099"; String companycode = "正泰集团股份有限公司"; String timespan = "1708908662738"; String s = Digest.md5(sfno + syscode + billcode + companycode + LOGIN_SECRET_KEY + timespan); @@ -324,7 +324,7 @@ class RouteApplicationTests { @Test void loginSignProd() { - String sfno = "231026051"; + String sfno = "230615020"; String syscode = "FSSC"; String billcode = "CLSQ240225000099"; String companycode = "正泰集团股份有限公司";