Merge remote-tracking branch 'origin/master'

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/core/provider/PhoneAuthenticationProvider.java

@@ -49,13 +49,13 @@ public class PhoneAuthenticationProvider extends AbstractAuthenticationProvider
         String smsCode = loginEntity.getSmsCode();
         String phone = loginEntity.getPhone();
         String qrCode = loginEntity.getQrCode();
-        if(StringUtils.isNotEmpty(qrCode) && StringUtils.isEmpty(smsCode)){
+        if (StringUtils.isNotEmpty(qrCode) && StringUtils.isEmpty(smsCode)) {
             // 二维码验证
             boolean b = sysUserService.verifyQrCode(phone, qrCode);
             if (!b) {
                 throw new BadCredentialsException("二维码校验失败");
             }
-        }else{
+        } else {
             // 验证码验证
             boolean b = smsCodeService.verifyValidCode(phone, smsCode, "SMS_VERIFY_CODE_LOGIN");
             if (!b) {
@@ -93,8 +93,7 @@ public class PhoneAuthenticationProvider extends AbstractAuthenticationProvider
             }
 
             if (!userInfo.getSysUser().getUserType().contains(clientId)
-                    && !userInfo.getSysUser().getUserType().contains(loginUserType)) {
-
+                    || (StringUtils.isNotEmpty(loginUserType) && !userInfo.getSysUser().getUserType().contains(loginUserType))) {
                 if (isRegister == false || StringUtils.equals("SYSTEM", clientId)) {
                     throw new LockedException("用户不存在");
                 } else {