admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug修复

Browse Source
This commit is contained in:
guo 2024-04-02 15:26:29 +08:00
parent 034c3e647e
commit c90b7a8a48
3 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/BaseModuleMapper.xml
View File

@ -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>

14
src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java
View File

@ -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");
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());

2
src/main/java/com/zhgd/xmgl/task/SafetyHatTask.java
View File

@ -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 {