Commit 33caa3a1eec2048776dcae268d37bed6ce211a62

Authored by 张志伟
1 parent a98480b0

:bug: 提测的bug修复

fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/StammkundeBizService.java
@@ -120,7 +120,7 @@ public class StammkundeBizService { @@ -120,7 +120,7 @@ public class StammkundeBizService {
120 120
121 if (StringUtils.isNotBlank(times[0]) && NumberUtils.isDigits(times[0])) { 121 if (StringUtils.isNotBlank(times[0]) && NumberUtils.isDigits(times[0])) {
122 LocalDateTime localDateTime = Instant.ofEpochMilli(NumberUtils.toLong(times[0])).atZone(ZoneId.systemDefault()).toLocalDateTime(); 122 LocalDateTime localDateTime = Instant.ofEpochMilli(NumberUtils.toLong(times[0])).atZone(ZoneId.systemDefault()).toLocalDateTime();
123 - queryVO.setStartTime(DateUtil.getEndInTime(DateUtil.localDateTime2Date(localDateTime))); 123 + queryVO.setStartTime(DateUtil.getBeginInTime(DateUtil.localDateTime2Date(localDateTime)));
124 } 124 }
125 if (times.length >= 2) { 125 if (times.length >= 2) {
126 if (StringUtils.isNotBlank(times[1]) && NumberUtils.isDigits(times[1])) { 126 if (StringUtils.isNotBlank(times[1]) && NumberUtils.isDigits(times[1])) {
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/PoolBizService.java
@@ -278,9 +278,6 @@ public class PoolBizService { @@ -278,9 +278,6 @@ public class PoolBizService {
278 if (Objects.nonNull(user)) { 278 if (Objects.nonNull(user)) {
279 queryVO.setUserId(user.getUserId()); 279 queryVO.setUserId(user.getUserId());
280 queryVO.setGroupId(user.getGroupId()); 280 queryVO.setGroupId(user.getGroupId());
281 - } else {  
282 - boolean bool = CollectionUtils.isEmpty(queryVO.getShopIds()) && Objects.isNull(queryVO.getUserId()) && StringUtils.isEmpty(queryVO.getUserName());  
283 - BV.isFalse(bool, () -> "请选择服务站或者人员");  
284 } 281 }
285 if (Objects.nonNull(queryVO.getOrder()) && StringUtils.isValid(queryVO.getOrderAtt())) { 282 if (Objects.nonNull(queryVO.getOrder()) && StringUtils.isValid(queryVO.getOrderAtt())) {
286 StringBuilder sb = new StringBuilder(" order by "); 283 StringBuilder sb = new StringBuilder(" order by ");