Merge branch '娄底高职分支' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 娄底高职分支

Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj

@@ -364,8 +364,10 @@
     <Compile Include="Areas\EducationalAdministration\Controllers\TeachPlanController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\TeachSwitchController.cs" />
     <Compile Include="Areas\EducationalAdministration\EducationalAdministrationAreaRegistration.cs" />
+    <Compile Include="Areas\LogisticsManagement\Controllers\Acc_DormitoryRuleController.cs" />
     <Compile Include="Areas\LogisticsManagement\Controllers\APAppointmentPsychologistController.cs" />
     <Compile Include="Areas\LogisticsManagement\Controllers\CompanyNewsController.cs" />
+    <Compile Include="Areas\LogisticsManagement\Controllers\DormitoryReturnController.cs" />
     <Compile Include="Areas\LogisticsManagement\LogisticsManagementAreaRegistration.cs" />
     <Compile Include="Areas\LR_AuthorizeModule\Controllers\AuthorizeController.cs" />
     <Compile Include="Areas\LR_AuthorizeModule\Controllers\FilterIPController.cs" />
@@ -1236,6 +1238,8 @@
     <Content Include="Areas\LogisticsManagement\Views\Accommodation\IndexBed.js" />
     <Content Include="Areas\LogisticsManagement\Views\Accommodation\IndexDistribution.js" />
     <Content Include="Areas\LogisticsManagement\Views\Accommodation\IndexImport.js" />
+    <Content Include="Areas\LogisticsManagement\Views\Acc_DormitoryRule\Form.js" />
+    <Content Include="Areas\LogisticsManagement\Views\Acc_DormitoryRule\Index.js" />
     <Content Include="Areas\LogisticsManagement\Views\ADR_Record\AttendanceReportByWeek.js" />
     <Content Include="Areas\LogisticsManagement\Views\ADR_Record\StatisticDetailIndex.js" />
     <Content Include="Areas\LogisticsManagement\Views\ADR_Record\StatisticIndex.js" />
@@ -1243,6 +1247,11 @@
     <Content Include="Areas\LogisticsManagement\Views\APAppointmentPsychologist\Index.js" />
     <Content Include="Areas\LogisticsManagement\Views\CompanyNews\Form.js" />
     <Content Include="Areas\LogisticsManagement\Views\CompanyNews\Index.js" />
+    <Content Include="Areas\LogisticsManagement\Views\DormitoryReturn\Form.js" />
+    <Content Include="Areas\LogisticsManagement\Views\DormitoryReturn\FormOut.js" />
+    <Content Include="Areas\LogisticsManagement\Views\DormitoryReturn\FormReturn.js" />
+    <Content Include="Areas\LogisticsManagement\Views\DormitoryReturn\Index.js" />
+    <Content Include="Areas\LogisticsManagement\Views\DormitoryReturn\IndexReport.js" />
     <Content Include="Areas\LR_AuthorizeModule\Views\Authorize\AppForm.js" />
     <Content Include="Areas\LR_AuthorizeModule\Views\Authorize\Form.css" />
     <Content Include="Areas\LR_AuthorizeModule\Views\Authorize\Form.js" />
@@ -7539,6 +7548,13 @@
     <Content Include="Areas\LR_Desktop\Views\EnrollData\IndexPersonnel.cshtml" />
     <Content Include="Content\excel\AccommodationImport.xls" />
     <Content Include="Areas\LogisticsManagement\Views\Accommodation\IndexImport.cshtml" />
+    <Content Include="Areas\LogisticsManagement\Views\Acc_DormitoryRule\Form.cshtml" />
+    <Content Include="Areas\LogisticsManagement\Views\Acc_DormitoryRule\Index.cshtml" />
+    <Content Include="Areas\LogisticsManagement\Views\DormitoryReturn\Form.cshtml" />
+    <Content Include="Areas\LogisticsManagement\Views\DormitoryReturn\FormOut.cshtml" />
+    <Content Include="Areas\LogisticsManagement\Views\DormitoryReturn\FormReturn.cshtml" />
+    <Content Include="Areas\LogisticsManagement\Views\DormitoryReturn\Index.cshtml" />
+    <Content Include="Areas\LogisticsManagement\Views\DormitoryReturn\IndexReport.cshtml" />
     <Content Include="Areas\LogisticsManagement\Views\Accommodation\ClearForm.cshtml" />
     <None Include="Properties\PublishProfiles\CustomProfile.pubxml" />
     <None Include="Properties\PublishProfiles\FolderProfile.pubxml" />

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Accommodation/AccommodationService.cs

@@ -2004,7 +2004,8 @@ where ID='{ParentID}'
                             var leaderno = "";
                             if (!string.IsNullOrEmpty(dr["舍长学号"].ToString()))
                             {
-                                leaderno = stuinfobasic.Where(x => x.StuNo == dr["舍长学号"].ToString() && x.ClassNo == ClassNo).FirstOrDefault()?.StuNo;
+                                //leaderno = stuinfobasic.Where(x => x.StuNo == dr["舍长学号"].ToString() && x.ClassNo == ClassNo).FirstOrDefault()?.StuNo;
+                                leaderno = stuinfobasic.Where(x => x.StuNo == dr["舍长学号"].ToString()).FirstOrDefault()?.StuNo;
                                 if (string.IsNullOrEmpty(leaderno))
                                 {
                                     fnum++;