|
@@ -160,7 +160,8 @@ public class WmUserSignServiceImpl extends ServiceImpl<WmUserSignMapper, WmUserS
|
|
|
|
|
|
Map<String, List<WmUserSign>> collect = signs.stream().collect(Collectors.groupingBy(WmUserSign::getSignEntId));
|
|
Map<String, List<WmUserSign>> collect = signs.stream().collect(Collectors.groupingBy(WmUserSign::getSignEntId));
|
|
List<WmUserSign> wmUserSigns = collect.get(wmUserSign.getSignEntId());
|
|
List<WmUserSign> wmUserSigns = collect.get(wmUserSign.getSignEntId());
|
|
- if (wmUserSigns.size() < eachLimit) {
|
|
|
|
|
|
+ int e = CollUtil.isNotEmpty(wmUserSigns) ? wmUserSigns.size() : 0 ;
|
|
|
|
+ if (e < eachLimit) {
|
|
|
|
|
|
// 一个用户,在同一打卡地点,4小时内只能打卡一次
|
|
// 一个用户,在同一打卡地点,4小时内只能打卡一次
|
|
Optional<LocalDateTime> first = wmUserSigns.stream().map(WmUserSign::getSignDate).filter(sd -> Duration.between(sd, now).toHours() <= 4).findFirst();
|
|
Optional<LocalDateTime> first = wmUserSigns.stream().map(WmUserSign::getSignDate).filter(sd -> Duration.between(sd, now).toHours() <= 4).findFirst();
|