Commit 6e189b6ae6c274a5fb641f3cb991776cb8e7c0cd
Merge branch 'dev' of http://101.95.0.106:8888/youxiw20000/trash into dev
Showing
1 changed file
with
1 additions
and
1 deletions
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarOrderServiceImpl.java
| @@ -117,7 +117,7 @@ public class GarOrderServiceImpl extends ServiceImpl<GarOrderMapper, GarOrder> | @@ -117,7 +117,7 @@ public class GarOrderServiceImpl extends ServiceImpl<GarOrderMapper, GarOrder> | ||
| 117 | LambdaQueryWrapper<GarOrder> qw = new LambdaQueryWrapper<>(); | 117 | LambdaQueryWrapper<GarOrder> qw = new LambdaQueryWrapper<>(); |
| 118 | qw.orderByAsc(GarOrder::getGarEvaluateFlag, GarOrder::getGarOrderHandlerStatus); | 118 | qw.orderByAsc(GarOrder::getGarEvaluateFlag, GarOrder::getGarOrderHandlerStatus); |
| 119 | // 居民用户 | 119 | // 居民用户 |
| 120 | - if (user.getGarUserType().equals(GlobalStatus.UserStatusEnum.DRIVER_USER.getDescription())) { | 120 | + if (user.getGarUserType().equals(GlobalStatus.UserStatusEnum.NORMAL_USER.getDescription())) { |
| 121 | PageHelper.startPage(pageNo, pageSize); | 121 | PageHelper.startPage(pageNo, pageSize); |
| 122 | // 待清运 || 清运中 || 已完成 || 待支付 | 122 | // 待清运 || 清运中 || 已完成 || 待支付 |
| 123 | if (GlobalStatus.GarOrderStatus.NEW_ORDER.getValue().equals(type) | 123 | if (GlobalStatus.GarOrderStatus.NEW_ORDER.getValue().equals(type) |