|
|
@@ -278,7 +278,10 @@ public class SysSystemServiceImpl extends ServiceImpl<SysSystemMapper, SysSystem
|
|
|
}
|
|
|
SysUser user = sysUserMapper.selectById(system.getUserId());
|
|
|
SysUserJzgInfo info = sysUserJzgInfoMapper.selectOne(new LambdaQueryWrapper<SysUserJzgInfo>()
|
|
|
- .eq(SysUserJzgInfo::getUserId, user.getId()));
|
|
|
+ .eq(SysUserJzgInfo::getUserId, user.getId())
|
|
|
+ .eq(SysUserJzgInfo::getIsDelete, YesNoEnum.NO.getCode())
|
|
|
+ .eq(SysUserJzgInfo::getSystemCode, system.getSysCode())
|
|
|
+ );
|
|
|
vo.setUserName(info.getName());
|
|
|
vo.setUserAccount(user.getMobile());
|
|
|
return vo;
|
|
|
@@ -405,13 +408,9 @@ public class SysSystemServiceImpl extends ServiceImpl<SysSystemMapper, SysSystem
|
|
|
// 新增管理员用户
|
|
|
sysUser = new SysUser(param);
|
|
|
boolean mobileExists = this.isExistsMobile(sysUser.getMobile());
|
|
|
- if(mobileExists){
|
|
|
- throw new SystemException("管理员手机号重复!");
|
|
|
- }
|
|
|
+ if(mobileExists){throw new SystemException("管理员手机号重复!");}
|
|
|
boolean nameExists = this.isExistsUserName(sysUser.getUsername());
|
|
|
- if(nameExists){
|
|
|
- throw new SystemException("管理员用户名重复!");
|
|
|
- }
|
|
|
+ if(nameExists){throw new SystemException("管理员用户名重复!");}
|
|
|
sysUserMapper.insert(sysUser);
|
|
|
|
|
|
// 新建顶级机构
|