From 43a71ae359403d925ba7c097e88be2a29db53b26 Mon Sep 17 00:00:00 2001
From: zhangli <1109134334@qq.com>
Date: Thu, 10 Mar 2022 16:37:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=A6=E7=94=9F=E5=BD=92=E5=AE=BF=20=20?=
 =?UTF-8?q?=E9=99=90=E5=88=B6=E5=BA=8A=E4=BD=8D=E4=B8=8B=E6=8B=89=E6=A1=86?=
 =?UTF-8?q?=E5=8F=AA=E6=98=BE=E7=A4=BA=E5=B7=B2=E5=88=86=E9=85=8D=E5=AD=A6?=
 =?UTF-8?q?=E7=94=9F=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Areas/LogisticsManagement/Views/DormitoryReturn/FormOut.js  | 2 +-
 .../LogisticsManagement/Views/DormitoryReturn/FormReturn.js     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/DormitoryReturn/FormOut.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/DormitoryReturn/FormOut.js
index 12f942c58..86cea8e66 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/DormitoryReturn/FormOut.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/DormitoryReturn/FormOut.js	
@@ -18,7 +18,7 @@ var bootstrap = function ($, learun) {
         bind: function () {
             $('#DormitoryBuildId').lrselect({
                 url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable',
-                param: { code: 'DormitoryInfo', strWhere: "ParentID='" + ParentId + "' and BuildType='5' order by name" },
+                param: { code: 'DormitoryInfo', strWhere: "ParentID='" + ParentId + "' and BuildType='5' and (StudentID is not null and len(StudentID)>0) order by name" },
                 text: 'name',
                 value: 'id',
                 allowSearch: true
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/DormitoryReturn/FormReturn.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/DormitoryReturn/FormReturn.js
index 5dcb77fe9..f9c654c5d 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/DormitoryReturn/FormReturn.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/DormitoryReturn/FormReturn.js	
@@ -18,7 +18,7 @@ var bootstrap = function ($, learun) {
         bind: function () {
             $('#DormitoryBuildId').lrselect({
                 url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable',
-                param: { code: 'DormitoryInfo', strWhere: "ParentID='" + ParentId + "' and BuildType='5' order by name" },
+                param: { code: 'DormitoryInfo', strWhere: "ParentID='" + ParentId + "' and BuildType='5' and (StudentID is not null and len(StudentID)>0) order by name" },
                 text: 'name',
                 value: 'id',
                 allowSearch: true