Commit 338ae5cdec0cf469df8fa1711f0d97411cc9f04e

Authored by Ran
1 parent 410a9b94

修改代码

src/main/java/com/order/erp/service/order/impl/OrderBaseInfoServiceImpl.java
@@ -1112,7 +1112,7 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl<OrderBaseInfoMapper, O @@ -1112,7 +1112,7 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl<OrderBaseInfoMapper, O
1112 List<OrderFieldLockApplyDO> fieldLockApplyDOList = orderFieldLockApplyService.list(new LambdaQueryWrapper<OrderFieldLockApplyDO>() 1112 List<OrderFieldLockApplyDO> fieldLockApplyDOList = orderFieldLockApplyService.list(new LambdaQueryWrapper<OrderFieldLockApplyDO>()
1113 .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN) 1113 .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
1114 .eq(OrderFieldLockApplyDO::getApplyUserId, dataScope.getLoginUserId()) 1114 .eq(OrderFieldLockApplyDO::getApplyUserId, dataScope.getLoginUserId())
1115 - .eq(OrderFieldLockApplyDO::getStatus, ApplyStatusEnum.WAIT_AUDIT.getStatus()) 1115 + .in(OrderFieldLockApplyDO::getStatus, new int[]{ApplyStatusEnum.WAIT_AUDIT.getStatus(),ApplyStatusEnum.AUDIT_REFUSE.getStatus()})
1116 .in(OrderFieldLockApplyDO::getOrderId, orderIds).orderByAsc(OrderFieldLockApplyDO::getId)); 1116 .in(OrderFieldLockApplyDO::getOrderId, orderIds).orderByAsc(OrderFieldLockApplyDO::getId));
1117 1117
1118 if (CollectionUtils.isNotEmpty(fieldLockApplyDOList)) { 1118 if (CollectionUtils.isNotEmpty(fieldLockApplyDOList)) {