From e50265de5ae4e5e4c8b8852e777216adab7c4ce4 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期三, 21 五月 2025 09:13:06 +0800
Subject: [PATCH] 合并分支

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

diff --git a/WebTM/views/user/login.html b/WebTM/views/user/login.html
index f8a6523..c51ad35 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');
                 }
             }

--
Gitblit v1.9.1