diff --git a/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustmentServiceImpl.java b/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustmentServiceImpl.java index cc50100..04e2c68 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustmentServiceImpl.java +++ b/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustmentServiceImpl.java @@ -3560,13 +3560,15 @@ public class EntrustmentServiceImpl extends ServiceImpl list = this.list(Wrappers.lambdaQuery() .eq(Entrustment::getClientOrgId, orgId) - .isNotNull(Entrustment::getDeliverer1Name) // 确保第一个配送员名字不为空 - .isNotNull(Entrustment::getDeliverer2Name) // 确保第二个配送员名字不为空 - .orderByDesc(Entrustment::getCreateTime)); // 按创建时间降序 + // 确保第一个配送员名字既不是null也不是空字符串 + .ne(Entrustment::getDeliverer1Name, null) + .ne(Entrustment::getDeliverer1Name, "") + // 确保第二个配送员名字既不是null也不是空字符串 + .ne(Entrustment::getDeliverer2Name, null) + .ne(Entrustment::getDeliverer2Name, "") + .orderByDesc(Entrustment::getCreateTime)); // 按创建时间降序排列 // 如果查询结果不为空且至少有一个条目 if (list != null && list.size() > 0) {