|
@@ -64,14 +64,14 @@ public class ReplenishmentOrderServiceImpl extends ServiceImpl<ReplenishmentOrde
|
|
|
if (StringUtils.hasText(queryDTO.getDeviceId())) {
|
|
if (StringUtils.hasText(queryDTO.getDeviceId())) {
|
|
|
wrapper.eq(ReplenishmentOrder::getDeviceId, queryDTO.getDeviceId());
|
|
wrapper.eq(ReplenishmentOrder::getDeviceId, queryDTO.getDeviceId());
|
|
|
}
|
|
}
|
|
|
- if (StringUtils.hasText(queryDTO.getShopId())) {
|
|
|
|
|
- wrapper.eq(ReplenishmentOrder::getShopId, Long.parseLong(queryDTO.getShopId()));
|
|
|
|
|
|
|
+ if (queryDTO.getShopId() != null) {
|
|
|
|
|
+ wrapper.eq(ReplenishmentOrder::getShopId, queryDTO.getShopId());
|
|
|
}
|
|
}
|
|
|
if (queryDTO.getStatus() != null) {
|
|
if (queryDTO.getStatus() != null) {
|
|
|
wrapper.eq(ReplenishmentOrder::getStatus, queryDTO.getStatus());
|
|
wrapper.eq(ReplenishmentOrder::getStatus, queryDTO.getStatus());
|
|
|
}
|
|
}
|
|
|
- if (StringUtils.hasText(queryDTO.getCreatorId())) {
|
|
|
|
|
- wrapper.eq(ReplenishmentOrder::getCreatorId, Long.parseLong(queryDTO.getCreatorId()));
|
|
|
|
|
|
|
+ if (queryDTO.getCreatorId() != null) {
|
|
|
|
|
+ wrapper.eq(ReplenishmentOrder::getCreatorId, queryDTO.getCreatorId());
|
|
|
}
|
|
}
|
|
|
if (StringUtils.hasText(queryDTO.getStartTime())) {
|
|
if (StringUtils.hasText(queryDTO.getStartTime())) {
|
|
|
wrapper.ge(ReplenishmentOrder::getCreateTime,
|
|
wrapper.ge(ReplenishmentOrder::getCreateTime,
|