|
|
@@ -9,6 +9,7 @@ import com.poteviohealth.ym.ipos.mapper.SplitWithdrawMapper;
|
|
|
import com.poteviohealth.ym.ipos.model.split.SplitWithdraw;
|
|
|
import com.poteviohealth.ym.ipos.model.split.dto.SplitWithdrawDto;
|
|
|
import com.poteviohealth.ym.ipos.service.ISplitWithdrawService;
|
|
|
+import org.apache.commons.lang.StringUtils;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
/**
|
|
|
@@ -23,8 +24,8 @@ public class SplitWithdrawServiceImpl extends ServiceImpl<SplitWithdrawMapper, S
|
|
|
public CommonPage<SplitWithdraw> pageList(SplitWithdrawDto dto) {
|
|
|
Page<SplitWithdraw> page = MyBatisConvertUtils.convert2Page(dto);
|
|
|
QueryWrapper<SplitWithdraw> wrapper = new QueryWrapper<>();
|
|
|
- wrapper.eq(dto.getTransStatus() != null,"trans_status", dto.getTransStatus());
|
|
|
- wrapper.eq(dto.getAcctStatus() != null,"acct_status", dto.getAcctStatus());
|
|
|
+ wrapper.eq(StringUtils.isNotEmpty(dto.getTransStatus()),"trans_status", dto.getTransStatus());
|
|
|
+ wrapper.eq(StringUtils.isNotEmpty(dto.getAcctStatus()),"acct_status", dto.getAcctStatus());
|
|
|
wrapper.ge(dto.getTransDateStart() != null, "trans_date",dto.getTransDateStart());
|
|
|
wrapper.le(dto.getTransDateEnd() != null, "trans_date",dto.getTransDateEnd());
|
|
|
Page<SplitWithdraw> result = this.page(page,wrapper);
|