|
@@ -322,8 +322,11 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
|
|
|
if (StringUtils.isNotEmpty(dto.getSellCorporationId())) {
|
|
|
wrapper.eq("t1", Contract::getSellCorporationId, dto.getSellCorporationId());
|
|
|
}
|
|
|
+ if(StringUtils.isNotEmpty(dto.getIsClaim())){
|
|
|
+ wrapper.ne("t1.refundStatusNew",20);
|
|
|
+ }
|
|
|
if (StringUtils.isNotEmpty(dto.getRefundStatusNew())) {
|
|
|
- wrapper.in("t1.refund_status", Arrays.asList(dto.getRefundStatusNew().split(",")));
|
|
|
+ wrapper.in("t1.refundStatusNew", Arrays.asList(dto.getRefundStatusNew().split(",")));
|
|
|
}
|
|
|
if (StringUtils.isNotEmpty(dto.getUserId())) {
|
|
|
wrapper.eq("t1", Contract::getCreateUser, dto.getUserId());
|