diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java index 37c9d48b8..517789b1c 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java @@ -91,6 +91,8 @@ public class SystemUserServiceImpl extends ServiceImpl map) { if (StringUtils.isNotEmpty(MapUtils.getString(map, "verificationCode"))) { @@ -622,7 +623,6 @@ public class SystemUserServiceImpl extends ServiceImpl getUserInfo(SystemUser systemUser) { Map result = new HashMap<>(); CompanyConfig companyConfig = null; @@ -766,9 +766,6 @@ public class SystemUserServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); @@ -1500,9 +1497,12 @@ public class SystemUserServiceImpl extends ServiceImpl workerInfo.getInserviceType() != 1)) { + if (CollUtil.isEmpty(workerInfos)) { throw new OpenAlertException("身份证号不存在"); } + if (workerInfos.stream().anyMatch(workerInfo -> workerInfo.getInserviceType() != 1)) { + throw new OpenAlertException("该人员不在场"); + } for (WorkerInfo dev : workerInfos) { if (!dev.getWorkerName().equals(name)) { throw new OpenAlertException("身份证号和人员姓名不匹配");