|
@@ -562,7 +562,6 @@ public class WmUserSignServiceImpl extends ServiceImpl<WmUserSignMapper, WmUserS
|
|
|
|
|
|
|
|
|
// 校验当日的拜访限制
|
|
|
-
|
|
|
int currCount = signs.size();
|
|
|
Integer monthLimit = totalLimitMap.get("MONTH");
|
|
|
if (monthLimit != null && monthLimit <= currCount) {
|
|
@@ -573,7 +572,7 @@ public class WmUserSignServiceImpl extends ServiceImpl<WmUserSignMapper, WmUserS
|
|
|
Integer dailyLimit = totalLimitMap.get("DAY");
|
|
|
if (dailyLimit != null) {
|
|
|
LocalDateTime todayStart = LocalDateTime.of(now.toLocalDate(), LocalTime.MIN);
|
|
|
- long dailyCount = wmUserSigns.stream().filter(sign -> sign.getSignDate().isAfter(todayStart)).count();
|
|
|
+ long dailyCount = signs.stream().filter(sign -> sign.getSignDate().isAfter(todayStart)).count();
|
|
|
if (dailyLimit <= dailyCount) {
|
|
|
log.warn("超过拜访次数上限打卡每日限制:{} {}", wmUserSign.getSignUserid(), wmUserSign.getSignEntName());
|
|
|
throw new BizException("超过拜访次数上限打卡每日限制");
|
|
@@ -583,7 +582,7 @@ public class WmUserSignServiceImpl extends ServiceImpl<WmUserSignMapper, WmUserS
|
|
|
Integer hourLimit = totalLimitMap.get("HOUR");
|
|
|
if (hourLimit != null) {
|
|
|
LocalDateTime hourStart = now.minusHours(1L);
|
|
|
- long hourCount = wmUserSigns.stream().filter(sign -> sign.getSignDate().isAfter(hourStart)).count();
|
|
|
+ long hourCount = signs.stream().filter(sign -> sign.getSignDate().isAfter(hourStart)).count();
|
|
|
if (hourLimit <= hourCount) {
|
|
|
log.warn("超过拜访次数上限打卡每小时限制:{} {}", wmUserSign.getSignUserid(), wmUserSign.getSignEntName());
|
|
|
throw new BizException("超过拜访次数上限打卡每小时限制");
|