|
@@ -143,7 +143,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
|
|
String password = (String)map.get("password");
|
|
String password = (String)map.get("password");
|
|
|
|
|
|
SysUser sysUser = this.getById(id);
|
|
SysUser sysUser = this.getById(id);
|
|
- Integer countAccount = sysAccountMultilevelMapper.selectCount(new QueryWrapper<SysAccountMultilevel>().eq("account",account));
|
|
|
|
|
|
+ Integer countAccount = sysAccountMultilevelMapper.selectCount(new QueryWrapper<SysAccountMultilevel>().eq("account",account).ne("type",7));
|
|
if (countAccount >0){
|
|
if (countAccount >0){
|
|
return new Result(10001,"该账号已存在",false);
|
|
return new Result(10001,"该账号已存在",false);
|
|
}
|
|
}
|
|
@@ -188,7 +188,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
|
|
Integer id = (Integer)map.get("id");
|
|
Integer id = (Integer)map.get("id");
|
|
String account = (String)map.get("account");
|
|
String account = (String)map.get("account");
|
|
String password = (String)map.get("password");
|
|
String password = (String)map.get("password");
|
|
- Integer countAccount = sysAccountMultilevelMapper.selectCount(new QueryWrapper<SysAccountMultilevel>().eq("account",account));
|
|
|
|
|
|
+ Integer countAccount = sysAccountMultilevelMapper.selectCount(new QueryWrapper<SysAccountMultilevel>().eq("account",account).ne("type",7));
|
|
if (countAccount >1){
|
|
if (countAccount >1){
|
|
return new Result(10001,"改账号已存在",false);
|
|
return new Result(10001,"改账号已存在",false);
|
|
}
|
|
}
|