diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/SystemUserMapper.xml b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/SystemUserMapper.xml index 24213758c..e677299fa 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/SystemUserMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/SystemUserMapper.xml @@ -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 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 b1d189327..c41b5ce50 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 @@ -1109,7 +1109,7 @@ public class SystemUserServiceImpl extends ServiceImpl getQueryWrapper(HashMap paramMap) { String alias = ""; QueryWrapper 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 registryList = xzRegistryMapper.selectList(new LambdaQueryWrapper() + .eq(XzRegistry::getAccount, xz.getAccount()) + .eq(XzRegistry::getApprovalProcess, 1) + ); + if (CollUtil.isNotEmpty(registryList)) { + throw new OpenAlertException("该账号已注册待审核,请不要重复注册"); + } xz.setId(null); baseMapper.insert(xz); }