diff --git a/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/StammkundeBizService.java b/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/StammkundeBizService.java index efb8334..3c80421 100644 --- a/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/StammkundeBizService.java +++ b/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/StammkundeBizService.java @@ -120,7 +120,7 @@ public class StammkundeBizService { if (StringUtils.isNotBlank(times[0]) && NumberUtils.isDigits(times[0])) { LocalDateTime localDateTime = Instant.ofEpochMilli(NumberUtils.toLong(times[0])).atZone(ZoneId.systemDefault()).toLocalDateTime(); - queryVO.setStartTime(DateUtil.getEndInTime(DateUtil.localDateTime2Date(localDateTime))); + queryVO.setStartTime(DateUtil.getBeginInTime(DateUtil.localDateTime2Date(localDateTime))); } if (times.length >= 2) { if (StringUtils.isNotBlank(times[1]) && NumberUtils.isDigits(times[1])) { diff --git a/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/PoolBizService.java b/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/PoolBizService.java index 44934db..379e243 100644 --- a/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/PoolBizService.java +++ b/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/PoolBizService.java @@ -278,9 +278,6 @@ public class PoolBizService { if (Objects.nonNull(user)) { queryVO.setUserId(user.getUserId()); queryVO.setGroupId(user.getGroupId()); - } else { - boolean bool = CollectionUtils.isEmpty(queryVO.getShopIds()) && Objects.isNull(queryVO.getUserId()) && StringUtils.isEmpty(queryVO.getUserName()); - BV.isFalse(bool, () -> "请选择服务站或者人员"); } if (Objects.nonNull(queryVO.getOrder()) && StringUtils.isValid(queryVO.getOrderAtt())) { StringBuilder sb = new StringBuilder(" order by ");