From d2df70a2c040013c45f179dea693676cad98bcd6 Mon Sep 17 00:00:00 2001
From: zhangli <1109134334@qq.com>
Date: Mon, 23 May 2022 16:34:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=A6=E7=94=9F=E5=AE=BF=E8=88=8D=E6=9F=A5?=
 =?UTF-8?q?=E7=9C=8B=EF=BC=8C=E6=A0=A1=E5=8C=BA=E6=9C=AA=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E4=B8=8D=E6=98=BE=E7=A4=BAundefined=EF=BC=9B=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=AE=BF=E8=88=8D=E6=A0=A1=E5=8C=BA=E5=AD=97=E6=AE=B5=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E8=8E=B7=E5=8F=96=E5=BD=93=E5=89=8D=E6=89=80=E5=9C=A8?=
 =?UTF-8?q?=E5=AD=A6=E6=A0=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Views/Accommodation/Floor.cshtml                   |  7 ++++++-
 .../LogisticsManagement/Views/Accommodation/Form.js    |  1 +
 .../Views/Accommodation/FormClassify.js                | 10 +++++-----
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Floor.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Floor.cshtml
index 06d008f5d..99ada60d1 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Floor.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Floor.cshtml	
@@ -168,7 +168,12 @@
                         key: value,
                         keyId: 'f_companyid',
                         callback: function (_data) {
-                            result = _data.f_fullname;
+                            if (!_data.f_fullname || _data.f_fullname == '' || _data.f_fullname == 'undefined') {
+                                result = '';
+                            }
+                            else {
+                                result = _data.f_fullname;
+                            }
                         }
                     });
 
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Form.js
index 38b25fdd2..ad4293746 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Form.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Form.js	
@@ -122,6 +122,7 @@ var bootstrap = function ($, learun) {
                 param: { parentId: '0' },
             }
             $('#Campus').lrselect(dfop);
+            $('#Campus').lrselectSet(learun.clientdata.get(['userinfo']).companyId);
 
         }
     };
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/FormClassify.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/FormClassify.js
index 878fe4fc5..86f11eb93 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/FormClassify.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/FormClassify.js	
@@ -25,7 +25,7 @@ var bootstrap = function ($, learun) {
                 allowSearch: true,
                 maxHeight: 225,
                 select: function (item) {
-                    if (item&&item.id!='-1') {
+                    if (item && item.id != '-1') {
                         $('#BuildType').lrselectSet(item.title);
                         $('#BuildType').attr('readonly', 'readonly');
                     } else {
@@ -43,7 +43,7 @@ var bootstrap = function ($, learun) {
                 type: 'radio',
                 code: 'HasToilet',
             })
-            
+
             //$('#StudentID').lrDataSourceSelect({ code: 'StuInfoBasic', value: 'stuid', text: 'stuname' }); 
             //$('#StudentID').lrDataSourceSelect({ code: 'StuInfoTwo', value: 'stuid', text: 'stuname' }); 
             $('#StudentID').lrselect({
@@ -51,7 +51,7 @@ var bootstrap = function ($, learun) {
                 text: "stuname",
                 url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=StuInfoBasic'
             });
-            
+
             $('#Class').lrselect({
                 value: "classno",
                 text: "classname"
@@ -115,7 +115,7 @@ var bootstrap = function ($, learun) {
 
             if (!!keyValue) {
                 $.lrSetForm(top.$.rootUrl + '/LogisticsManagement/Accommodation/GetFormData?keyValue=' + keyValue,
-                    function(data) {
+                    function (data) {
                         for (var id in data) {
                             if (!!data[id].length && data[id].length > 0) {
                                 $('#' + id).jfGridSet('refreshdata', data[id]);
@@ -141,7 +141,7 @@ var bootstrap = function ($, learun) {
                 param: { parentId: '0' },
             }
             $('#Campus').lrselect(dfop);
-
+            $('#Campus').lrselectSet(learun.clientdata.get(['userinfo']).companyId);
         }
     };
     // 保存数据