修改

project-order/src/main/java/com/alibaba/cloud/integration/order/service/impl/OrderServiceListServiceImpl.java

@@ -12,6 +12,7 @@ import com.alibaba.cloud.integration.order.entity.OrderRequest;
 import com.alibaba.cloud.integration.order.service.OrderServiceListService;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.netty.util.internal.StringUtil;
 import org.apache.logging.log4j.util.Strings;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -44,10 +45,10 @@ public class OrderServiceListServiceImpl implements OrderServiceListService {
 		LambdaQueryWrapper<OrderRequest> lqw = new LambdaQueryWrapper<>();
 		lqw.ge(OrderRequest::getExpectTimeBegin, this.getTimestampFromDate(startDate));  //预约开始日期
 		lqw.le(OrderRequest::getExpectTimeBegin, this.getTimestampFromDate(endDate)); //预约结束日期
-		lqw.eq(!appointmentStatus.isEmpty(), OrderRequest::getAppointmentStatus, appointmentStatus); //指派状态
-		lqw.eq(!type.isEmpty(), OrderRequest::getType, type); //设备类型
-		lqw.eq(!brand.isEmpty(), OrderRequest::getBrand, brand); //品牌
-		lqw.eq(!skill.isEmpty(), OrderRequest::getSkill, skill); //技能
+		lqw.eq(!StringUtil.isNullOrEmpty(appointmentStatus), OrderRequest::getAppointmentStatus, appointmentStatus); //指派状态
+		lqw.eq(!StringUtil.isNullOrEmpty(type), OrderRequest::getType, type); //设备类型
+		lqw.eq(!StringUtil.isNullOrEmpty(brand), OrderRequest::getBrand, brand); //品牌
+		lqw.eq(!StringUtil.isNullOrEmpty(skill), OrderRequest::getSkill, skill); //技能
 
 		// 查询工单表列表
 		orderRequestMPDao.selectPage(pg, lqw);