扫码登录

fs-company/src/main/java/com/fs/framework/service/CompanyLoginService.java

@@ -1,5 +1,6 @@
 package com.fs.framework.service;
 
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.http.HttpUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
@@ -173,7 +174,7 @@ public class CompanyLoginService
         }
 
         // 判断是否开启了扫码配置
-        if (!isNeedScan){
+        if (ObjectUtil.isEmpty(isNeedScan) || !isNeedScan){
             return false;
         }
 

fs-framework/src/main/java/com/fs/framework/web/service/SysLoginService.java

@@ -2,6 +2,7 @@ package com.fs.framework.web.service;
 
 import javax.annotation.Resource;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.fs.common.service.WechatLoginService;
@@ -195,7 +196,7 @@ public class SysLoginService
         }
 
         // 判断是否开启了扫码配置
-        if (!isNeedScan){
+        if (ObjectUtil.isEmpty(isNeedScan) || !isNeedScan){
             return false;
         }