From 7ecc95cebe0e6c0349c0a6f1ac01d611a0b2b351 Mon Sep 17 00:00:00 2001
From: guoshengxiong <1923636941@qq.com>
Date: Fri, 24 May 2024 14:48:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=B3=E5=8A=A1=E4=BA=BA=E5=91=98=E6=A0=B9?=
 =?UTF-8?q?=E6=8D=AE=E8=BA=AB=E4=BB=BD=E8=AF=81=E5=8F=B7=E5=92=8C=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0=E7=99=BB=E5=BD=95=E6=8F=90=E7=A4=BA=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/SystemUserServiceImpl.java          | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

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<SystemUserMapper, SystemU
      */
     private static final String PW_FAILED_COUNT_PREFIX = "USER_PW_FAILED_COUNT:";
     @Autowired
+    WorkerInfoServiceImpl workerInfoService;
+    @Autowired
     private MechanicalEquipmentPositionDevMapper mechanicalEquipmentPositionDevMapper;
     @Autowired
     private WorkerInfoMapper workerInfoMapper;
@@ -437,7 +439,6 @@ public class SystemUserServiceImpl extends ServiceImpl<SystemUserMapper, SystemU
         }
     }
 
-
     @Override
     public void register(Map<String, Object> map) {
         if (StringUtils.isNotEmpty(MapUtils.getString(map, "verificationCode"))) {
@@ -622,7 +623,6 @@ public class SystemUserServiceImpl extends ServiceImpl<SystemUserMapper, SystemU
         }
     }
 
-
     private Map<String, Object> getUserInfo(SystemUser systemUser) {
         Map<String, Object> result = new HashMap<>();
         CompanyConfig companyConfig = null;
@@ -766,9 +766,6 @@ public class SystemUserServiceImpl extends ServiceImpl<SystemUserMapper, SystemU
         return systemUser.getUserId();
     }
 
-    @Autowired
-    WorkerInfoServiceImpl workerInfoService;
-
     @Override
     public void editSystemUser(SystemUser systemUser) {
         QueryWrapper<SystemUser> queryWrapper = new QueryWrapper<>();
@@ -1500,9 +1497,12 @@ public class SystemUserServiceImpl extends ServiceImpl<SystemUserMapper, SystemU
                 .eq(WorkerInfo::getIdCard, idCard)
                 .eq(StrUtil.isNotBlank(projectSn), WorkerInfo::getProjectSn, projectSn)
         );
-        if (CollUtil.isEmpty(workerInfos) || workerInfos.stream().anyMatch(workerInfo -> 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("身份证号和人员姓名不匹配");