管理端bug修复
This commit is contained in:
@@ -713,13 +713,12 @@ public class CashOutServiceImpl extends ServiceImpl<CashOutDao, CashOut> impleme
|
||||
if (cashOut.getState() != null) {
|
||||
queryWrapper.eq(CashOut::getState, cashOut.getState());
|
||||
}
|
||||
|
||||
if (StrUtil.isNotBlank(cashOut.getStartTime()) && StrUtil.isNotBlank(cashOut.getEndTime())) {
|
||||
queryWrapper.between(CashOut::getCreateAt, DateUtil.parseUTC(cashOut.getStartTime()).toString(), DateUtil.parseUTC(cashOut.getEndTime()).toString());
|
||||
queryWrapper.between(CashOut::getCreateAt, cashOut.getStartTime(), cashOut.getEndTime());
|
||||
} else if (StrUtil.isNotBlank(cashOut.getStartTime())) {
|
||||
queryWrapper.ge(CashOut::getCreateAt, DateUtil.parseUTC(cashOut.getStartTime()).toString());
|
||||
queryWrapper.ge(CashOut::getCreateAt, cashOut.getStartTime());
|
||||
} else if (StrUtil.isNotBlank(cashOut.getEndTime())) {
|
||||
queryWrapper.le(CashOut::getCreateAt, DateUtil.parseUTC(cashOut.getEndTime()).toString());
|
||||
queryWrapper.le(CashOut::getCreateAt, cashOut.getEndTime());
|
||||
}
|
||||
|
||||
queryWrapper.orderByDesc(CashOut::getCreateAt);
|
||||
|
||||
Reference in New Issue
Block a user