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-08 16:55:29 +08:00
parent 97b0aee912
commit 3b027a885f
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/SystemUserMapper.xml
View File

@ -205,5 +205,6 @@
LEFT JOIN organization_job jb ON a.job_id = jb.id
left join xz_registry xr on xr.account=a.account
WHERE p.sn = #{projectSn} and a.account_type=10 and p.type = 2
order by registryTime desc
</select>
</mapper>

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

@ -1109,7 +1109,7 @@ public class SystemUserServiceImpl extends ServiceImpl<SystemUserMapper, SystemU
if (CollUtil.isNotEmpty(registryList)) {
throw new OpenAlertException("账号待审核");
} else {
failedPrompt(key, num);
throw new OpenAlertException("账号不存在");
}
} else {
if (!StringUtils.equalsIgnoreCase(SecureUtil.md5(SecureUtil.md5(systemUser.getShowPassword()) + timestamp), md5Password)) {

10
src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzRegistryServiceImpl.java
View File

@ -1,5 +1,6 @@
package com.zhgd.xmgl.modules.xz.service.impl;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@ -71,7 +72,7 @@ public class XzRegistryServiceImpl extends ServiceImpl<XzRegistryMapper, XzRegis
private QueryWrapper<XzRegistry> getQueryWrapper(HashMap<String, Object> paramMap) {
String alias = "";
QueryWrapper<XzRegistry> queryWrapper = QueryGenerator.initPageQueryWrapper(XzRegistry.class, paramMap, alias);
queryWrapper.orderByDesc(alias + RefUtil.fieldNameUlc(XzRegistry::getId));
queryWrapper.orderByDesc(alias + RefUtil.fieldNameUlc(XzRegistry::getCreateTime));
return queryWrapper;
}
@ -106,6 +107,13 @@ public class XzRegistryServiceImpl extends ServiceImpl<XzRegistryMapper, XzRegis
xz.setApprovalProcess(2);
baseMapper.insert(xz);
} else if (Objects.equals(xz.getAccountType(), 1)) {
List<XzRegistry> registryList = xzRegistryMapper.selectList(new LambdaQueryWrapper<XzRegistry>()
.eq(XzRegistry::getAccount, xz.getAccount())
.eq(XzRegistry::getApprovalProcess, 1)
);
if (CollUtil.isNotEmpty(registryList)) {
throw new OpenAlertException("该账号已注册待审核，请不要重复注册");
}
xz.setId(null);
baseMapper.insert(xz);
}