fix: 签到npe 2

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmUserSignServiceImpl.java

@@ -160,32 +160,32 @@ public class WmUserSignServiceImpl extends ServiceImpl<WmUserSignMapper, WmUserS
 
 			Map<String, List<WmUserSign>> collect = signs.stream().collect(Collectors.groupingBy(WmUserSign::getSignEntId));
 			List<WmUserSign> wmUserSigns = collect.get(wmUserSign.getSignEntId());
-			int e = CollUtil.isNotEmpty(wmUserSigns) ? wmUserSigns.size() : 0 ;
-			if (e < eachLimit) {
+			if (CollUtil.isNotEmpty(wmUserSigns)){
+				if (wmUserSigns.size() < eachLimit) {
 
-				// 一个用户，在同一打卡地点，4小时内只能打卡一次
-				Optional<LocalDateTime> first = wmUserSigns.stream().map(WmUserSign::getSignDate).filter(sd -> Duration.between(sd, now).toHours() <= 4).findFirst();
+					// 一个用户，在同一打卡地点，4小时内只能打卡一次
+					Optional<LocalDateTime> first = wmUserSigns.stream().map(WmUserSign::getSignDate).filter(sd -> Duration.between(sd, now).toHours() <= 4).findFirst();
 
-				if (first.isPresent()) {
-					log.warn("打卡间隔过短：{} {}", wmUserSign.getSignUserid(), wmUserSign.getSignEntName());
-					return R.failed("打卡间隔过短");
-				}
+					if (first.isPresent()) {
+						log.warn("打卡间隔过短：{} {}", wmUserSign.getSignUserid(), wmUserSign.getSignEntName());
+						return R.failed("打卡间隔过短");
+					}
 
-				// 一个用户，半小时内只能打卡一次
-				Optional<LocalDateTime> first1 = signs.stream().map(WmUserSign::getSignDate).filter(sd -> Duration.between(sd, now).toMinutes() <= 30).findFirst();
+					// 一个用户，半小时内只能打卡一次
+					Optional<LocalDateTime> first1 = signs.stream().map(WmUserSign::getSignDate).filter(sd -> Duration.between(sd, now).toMinutes() <= 30).findFirst();
 
-				if (first1.isPresent()) {
-					log.warn("打卡间隔过短：{} {}", wmUserSign.getSignUserid(), wmUserSign.getSignEntName());
-					return R.failed("打卡间隔过短");
-				}
+					if (first1.isPresent()) {
+						log.warn("打卡间隔过短：{} {}", wmUserSign.getSignUserid(), wmUserSign.getSignEntName());
+						return R.failed("打卡间隔过短");
+					}
 
 
-			} else {
-				log.warn("超过每个地点打卡限制：{} {}", wmUserSign.getSignUserid(), wmUserSign.getSignEntName());
-				return R.failed("超过每个地点打卡限制");
+				} else {
+					log.warn("超过每个地点打卡限制：{} {}", wmUserSign.getSignUserid(), wmUserSign.getSignEntName());
+					return R.failed("超过每个地点打卡限制");
+				}
 			}
 
-
 		} else {
 			log.warn("超过打卡每日限制：{} {}", wmUserSign.getSignUserid(), wmUserSign.getSignEntName());
 			return R.failed("超过打卡每日限制");