|
@@ -79,7 +79,7 @@ public class AccountRunningWaterServiceImpl extends ServiceImpl<AccountRunningWa
|
|
if (StringUtils.isNotEmpty(dto.getKeyword())) {
|
|
if (StringUtils.isNotEmpty(dto.getKeyword())) {
|
|
wrapper.and(wrapper1 -> wrapper1.like("arw.remarks", dto.getKeyword()).or().like("arw.name", dto.getKeyword()));
|
|
wrapper.and(wrapper1 -> wrapper1.like("arw.remarks", dto.getKeyword()).or().like("arw.name", dto.getKeyword()));
|
|
}
|
|
}
|
|
- if (ObjectUtil.isNotEmpty(dto.getDataType()) && dto.getDataType() == 1) {//到账认领数据
|
|
|
|
|
|
+ if (ObjectUtil.isNotEmpty(dto.getDataType()) && dto.getDataType() == 1) {// 到账认领数据
|
|
wrapper.eq("arw.received", 10);
|
|
wrapper.eq("arw.received", 10);
|
|
wrapper.orderByAsc("arw.is_claim", "arw.create_time");
|
|
wrapper.orderByAsc("arw.is_claim", "arw.create_time");
|
|
}
|
|
}
|