|
|
|
@ -3563,10 +3563,8 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru |
|
|
|
|
List<Entrustment> list = this.list(Wrappers.<Entrustment>lambdaQuery() |
|
|
|
|
.eq(Entrustment::getClientOrgId, orgId) |
|
|
|
|
// 确保第一个配送员名字既不是null也不是空字符串
|
|
|
|
|
.ne(Entrustment::getDeliverer1Name, null) |
|
|
|
|
.ne(Entrustment::getDeliverer1Name, "") |
|
|
|
|
// 确保第二个配送员名字既不是null也不是空字符串
|
|
|
|
|
.ne(Entrustment::getDeliverer2Name, null) |
|
|
|
|
.ne(Entrustment::getDeliverer2Name, "") |
|
|
|
|
.orderByDesc(Entrustment::getCreateTime)); // 按创建时间降序排列
|
|
|
|
|
|
|
|
|
|