Przeglądaj źródła

对于没有绑定企微的用户,需要使用账号密码登录

seyason 2 lat temu
rodzic
commit
64c1e01e98

+ 2 - 2
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/AuthRedirectController.java

@@ -119,7 +119,7 @@ public class AuthRedirectController {
                     }
                 } else {
                     System.err.println("==生成企业微信User失败==");
-                    reqParam.put("errorMsg", MessageUtils.message("user.accountNoExist"));
+                    reqParam.put("errorMsg", "尚未绑定企业微信,请使用账号密码登录。");
                 }
 
             }
@@ -220,7 +220,7 @@ public class AuthRedirectController {
                             }
                         } else {
                             System.err.println("==生成企业微信User失败==");
-                            reqParam.put("errorMsg", MessageUtils.message("user.accountNoExist"));
+                            reqParam.put("errorMsg", "尚未绑定企业微信,请使用账号密码登录。");
                         }
 
                     }

+ 2 - 1
fhKeeper/formulahousekeeper/timesheet/src/views/Login.vue

@@ -110,7 +110,7 @@
                 this.automaticLogin(jobNumber, token)
             }
             // 用户绑定了企业微信
-            if(windowHerf.indexOf('user') != '-1') {
+            if(windowHerf.indexOf('userId') != '-1') {
                 this.bindingqywx = true
             }
         },
@@ -152,6 +152,7 @@
                         }
                     } else if (href.indexOf('errorMsg=') > 0) {
                         var errorMsg = href.split('errorMsg=')[1].split('#')[0];
+                        errorMsg = decodeURI(errorMsg);
                         this.$message({
                             message: errorMsg,
                             type: 'error'