Merge branch 'dev_v2.0.0' into master_v2.0.0

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/SysUserServiceImpl.java

@@ -258,7 +258,12 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             if (Objects.isNull(sysUser.getId())) {//新增用户
                 // 登录名是否唯一
                 QueryWrapper<SysUser> queryWrapper = new QueryWrapper<>();
-                queryWrapper.lambda().eq(SysUser::getSchoolId, schoolId).eq(SysUser::getLoginName, sysUser.getLoginName());
+                if(Objects.isNull(schoolId)){
+                    queryWrapper.lambda().isNull(SysUser::getSchoolId);
+                } else {
+                    queryWrapper.lambda().eq(SysUser::getSchoolId, schoolId);
+                }
+                queryWrapper.lambda().eq(SysUser::getLoginName, sysUser.getLoginName());
                 SysUser user = sysUserService.getOne(queryWrapper);
                 if(user != null){
                     throw ExceptionResultEnum.ERROR.exception("用户名已存在");