|
|
@@ -271,7 +271,8 @@ public class VppContractServiceImpl implements VppContractService {
|
|
|
LambdaQueryWrapper<VppContract> queryWrapper = new LambdaQueryWrapper<>();
|
|
|
queryWrapper.eq(VppContract::getDeleteFlag, 0)
|
|
|
.eq(tenantId != null, VppContract::getTenantId, tenantId)
|
|
|
- .ne(VppContract::getContractStatus, VppContractStatusHelper.DRAFT)
|
|
|
+ .in(VppContract::getContractStatus, VppContractStatusHelper.PENDING,
|
|
|
+ VppContractStatusHelper.EFFECTIVE, VppContractStatusHelper.EXPIRED)
|
|
|
.isNotNull(VppContract::getCustomerId)
|
|
|
.isNotNull(VppContract::getExpireDate)
|
|
|
.orderByDesc(VppContract::getCreateTime);
|