From c32c47bed40ee7bef531ea42df2fcdd55d479fc4 Mon Sep 17 00:00:00 2001
From: llj <132905093+newwwwwwtree@users.noreply.github.com>
Date: 星期二, 06 一月 2026 09:40:43 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI

---
 WebTM/views/user/login.html |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/WebTM/views/user/login.html b/WebTM/views/user/login.html
index f8a6523..e324913 100644
--- a/WebTM/views/user/login.html
+++ b/WebTM/views/user/login.html
@@ -285,7 +285,7 @@
             getBaseInfo(login_data2.HTranSlate);
 
 
-            if (login_data == null) {
+            if (login_data == null || login_data2.HTranSlate == undefined) {
                 initFunction(1, "login", 1);
             } else {
                 initFunction(1, "login", login_data2.HTranSlate);
@@ -372,7 +372,7 @@
                     var data2 = JSON.parse(data);
                     $("#LAY-user-login-username").val(data2["UserID"]);
                     $("#Organization").val(data2["OrgID"]);
-                    $("#HTranSlate").val(data2["HTranSlate"]);
+                    $("#HTranSlate").val(data2["HTranSlate"] == undefined ? 1 : data2["HTranSlate"]);
                     form.render('select');
                 }
             }
@@ -392,7 +392,7 @@
 
             //鐧诲綍
             function loging() {
-                if ($("#Organization").val() == 0) {
+                if ($("#Organization").val() == 0 || $("#Organization").val() == "" || $("#Organization").val() == null || $("#Organization").val() == undefined) {
                     //playSound();
                     layer.msg(get_MessageError("[0000-1-071]璇烽�夋嫨缁勭粐锛�", $("#HTranSlate").val()));
                     return;

--
Gitblit v1.9.1