【fix】预订人查询问题修复

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.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}))")
     Integer countByCondition(@Param("dto") OrderPageQuery dto);
 }

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;
+        }
+    }
 }

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