From 4a55a9fd319ac1f0303c636ddc3504e082961063 Mon Sep 17 00:00:00 2001
From: nixj <nxj>
Date: Wed, 19 Jun 2024 08:54:22 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90fix=E3=80=91=E9=A2=84=E8=AE=A2?=
 =?UTF-8?q?=E4=BA=BA=E6=9F=A5=E8=AF=A2=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../repository/jdbc/JdbcOrderDetailRepository.java    |  6 +++---
 .../com/chint/manage/entity/query/OrderPageQuery.java | 11 +++++++++++
 .../chint/manage/service/impl/ManageServiceImpl.java  |  2 +-
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/chint/infrastructure/repository/jdbc/JdbcOrderDetailRepository.java b/src/main/java/com/chint/infrastructure/repository/jdbc/JdbcOrderDetailRepository.java
index ea8c593a..1889fff8 100644
--- a/src/main/java/com/chint/infrastructure/repository/jdbc/JdbcOrderDetailRepository.java
+++ b/src/main/java/com/chint/infrastructure/repository/jdbc/JdbcOrderDetailRepository.java
@@ -42,7 +42,7 @@ public interface JdbcOrderDetailRepository extends CrudRepository<OrderDetail, L
             "AND (:#{#dto.startTime} IS NULL OR :#{#dto.endTime} IS NULL OR order_date BETWEEN :#{#dto.startTime} AND :#{#dto.endTime}) " +
             "AND (:#{#dto.productType} ='' OR product_type = :#{#dto.productType}) " +
             "AND (:#{#dto.employeeNo} ='' OR employee_no = :#{#dto.employeeNo}) " +
-            "AND (:#{#dto.employeeNos} IS NULL OR employee_no IN (:#{#dto.employeeNos})) " +
+            "AND (:#{#dto.employeeNosEmpty} = TRUE OR employee_no IN (:#{#dto.employeeNos}))" +
             "LIMIT :#{#pageRequest.pageSize} OFFSET :#{#pageRequest.pageNumber}")
     List<OrderDetail> listByCondition(@Param("dto") OrderPageQuery dto, @Param("pageRequest")PageRequest pageRequest);
 
@@ -51,7 +51,7 @@ public interface JdbcOrderDetailRepository extends CrudRepository<OrderDetail, L
             "AND (:#{#dto.orderNo} ='' OR order_no LIKE :#{#dto.orderNo}) " +
             "AND (:#{#dto.startTime} IS NULL OR :#{#dto.endTime} IS NULL OR order_date BETWEEN :#{#dto.startTime} AND :#{#dto.endTime} ) " +
             "AND (:#{#dto.productType} ='' OR product_type = :#{#dto.productType}) "+
-            "AND (:#{#dto.employeeNo} ='' OR employee_no = :#{#dto.employeeNo}) "+
-            "AND (:#{#dto.employeeNos} IS NULL OR employee_no IN (:#{#dto.employeeNos})) ")
+            "AND (:#{#dto.employeeNo} ='' OR employee_no = :#{#dto.employeeNo}) " +
+            "AND (:#{#dto.employeeNosEmpty} = TRUE OR employee_no IN (:#{#dto.employeeNos}))")
     Integer countByCondition(@Param("dto") OrderPageQuery dto);
 }
diff --git a/src/main/java/com/chint/manage/entity/query/OrderPageQuery.java b/src/main/java/com/chint/manage/entity/query/OrderPageQuery.java
index f65a133b..485fcfcc 100644
--- a/src/main/java/com/chint/manage/entity/query/OrderPageQuery.java
+++ b/src/main/java/com/chint/manage/entity/query/OrderPageQuery.java
@@ -29,4 +29,15 @@ public class OrderPageQuery extends BaseQuery {
     private List<String> employeeNos=null;
 
     private List<Long> routeIds=null;
+
+    private boolean employeeNosEmpty;
+
+
+    public boolean getEmployeeNosEmpty() {
+        if(employeeNos==null||employeeNos.isEmpty()){
+            return true;
+        }else {
+            return false;
+        }
+    }
 }
diff --git a/src/main/java/com/chint/manage/service/impl/ManageServiceImpl.java b/src/main/java/com/chint/manage/service/impl/ManageServiceImpl.java
index fa8ea10a..a8d67902 100644
--- a/src/main/java/com/chint/manage/service/impl/ManageServiceImpl.java
+++ b/src/main/java/com/chint/manage/service/impl/ManageServiceImpl.java
@@ -177,7 +177,7 @@ public class ManageServiceImpl implements ManageService {
         }
         dto.setRouteIds(dataRouteIds);
 
-        //预订人 todo 预订人查询还有点问题
+        //预订人
         if (!dto.getApplicant().equals("")){
             List<User> users=jdbcUserRepository.findAllByNameContains(dto.getApplicant());
             if (users==null||users.isEmpty()) {