From c90b7a8a48ed7de2c830e60d543c445b86a289fd Mon Sep 17 00:00:00 2001
From: guo <guo@guo>
Date: Tue, 2 Apr 2024 15:26:29 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basicdata/mapper/xml/BaseModuleMapper.xml    |  2 +-
 .../service/impl/SystemUserServiceImpl.java      | 16 +++++++++++++++-
 .../java/com/zhgd/xmgl/task/SafetyHatTask.java   |  2 +-
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/BaseModuleMapper.xml b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/BaseModuleMapper.xml
index 9f5335163..bd9524e38 100644
--- a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/BaseModuleMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/BaseModuleMapper.xml
@@ -72,7 +72,7 @@
     <select id="getSupplierModuleList" resultType="com.zhgd.xmgl.modules.basicdata.entity.BaseModule">
         SELECT a.*
         from base_module a
-        WHERE a.style_type=6 and a.style_type=#{styleType}
+        WHERE a.module_type=6 and a.style_type=#{styleType}
         ORDER BY a.module_type,a.label_sort_num,a.label_name,a.module_id
     </select>
 </mapper>
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 5cfa431f2..c23705b6d 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
@@ -1,5 +1,6 @@
 package com.zhgd.xmgl.modules.basicdata.service.impl;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.*;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.crypto.SecureUtil;
@@ -30,6 +31,8 @@ import com.zhgd.xmgl.modules.worker.entity.UserEnterprise;
 import com.zhgd.xmgl.modules.worker.entity.WorkerInfo;
 import com.zhgd.xmgl.modules.worker.mapper.WorkerInfoMapper;
 import com.zhgd.xmgl.modules.worker.service.IUserEnterpriseService;
+import com.zhgd.xmgl.modules.xz.entity.XzRegistry;
+import com.zhgd.xmgl.modules.xz.mapper.XzRegistryMapper;
 import com.zhgd.xmgl.security.JwtTokenProvider;
 import com.zhgd.xmgl.security.entity.UserInfo;
 import com.zhgd.xmgl.security.util.SecurityUtils;
@@ -71,6 +74,8 @@ public class SystemUserServiceImpl extends ServiceImpl<SystemUserMapper, SystemU
     @Autowired
     private RedisRepository redisRepository;
     @Autowired
+    private XzRegistryMapper xzRegistryMapper;
+    @Autowired
     private QualityRegionMapper qualityRegionMapper;
     @Autowired
     private ICompanyService companyService;
@@ -1087,7 +1092,16 @@ public class SystemUserServiceImpl extends ServiceImpl<SystemUserMapper, SystemU
 
             if (systemUser == null || systemUser.getUserId() == null) {
                 log.info("查询不到systemUser");
-                failedPrompt(key, num);
+                List<XzRegistry> registryList = xzRegistryMapper.selectList(new LambdaQueryWrapper<XzRegistry>()
+                        .eq(XzRegistry::getAccount, account)
+                        .eq(XzRegistry::getAccountType, 1)
+                        .eq(XzRegistry::getApprovalProcess, 1)
+                );
+                if (CollUtil.isNotEmpty(registryList)) {
+                    throw new OpenAlertException("账号待审核");
+                } else {
+                    failedPrompt(key, num);
+                }
             } else {
                 if (!StringUtils.equalsIgnoreCase(SecureUtil.md5(SecureUtil.md5(systemUser.getShowPassword()) + timestamp), md5Password)) {
                     log.info("密码不正确，原：{}，现：{}", md5Password, systemUser.getPassword());
diff --git a/src/main/java/com/zhgd/xmgl/task/SafetyHatTask.java b/src/main/java/com/zhgd/xmgl/task/SafetyHatTask.java
index 031ccc166..051c2dee3 100644
--- a/src/main/java/com/zhgd/xmgl/task/SafetyHatTask.java
+++ b/src/main/java/com/zhgd/xmgl/task/SafetyHatTask.java
@@ -149,7 +149,7 @@ public class SafetyHatTask {
                             data.setLatitude(xPoint);
                             data.setLongitude(yPoint);
                             data.setUploadTime(new Date(time * 1000L));
-                            data.setProjectSn(dev.getDevSn());
+                            data.setProjectSn(dev.getProjectSn());
                             safetyHatDataMapper.insert(data);
                         }
                     } else {