Merge branch '长阳分支中职' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 长阳分支中职

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Room.cshtml

@@ -79,10 +79,10 @@
                                                 <div class="inSec1ConTxt">
                                                     姓名 <span :title="floor.stuInfo.StuName" class="inSec1ConSpan1">{{floor.stuInfo.StuName}}</span> &nbsp;&nbsp;&nbsp;&nbsp; 学号 <span :title="floor.stuInfo.StuNo" class="inSec1ConSpan2" style="margin-left:0">{{floor.stuInfo.StuNo}}</span>
                                                 </div>
-                                                <div class="inSec1ConTxt">
+                                                @*<div class="inSec1ConTxt">
                                                     院系 <span :title="floor.stuInfo.DeptNo | filter_Dept" class="inSec1ConSpan1">{{floor.stuInfo.DeptNo | filter_Dept}}</span> &nbsp;&nbsp;&nbsp;&nbsp; 专业 <span :title="floor.stuInfo.MajorNo | filter_Major" style="margin-left:0" class="inSec1ConSpan2">{{floor.stuInfo.MajorNo | filter_Major}}</span>
                                                 </div>
-                                                <div @@click="checkDetail(floor)" class="inSec1Btn">查看更多信息  <i class="fa fa-angle-right"></i></div>
+                                                <div @@click="checkDetail(floor)" class="inSec1Btn">查看更多信息  <i class="fa fa-angle-right"></i></div>*@
                                             </div>
                                         </div>
                                     </li>
@@ -237,7 +237,7 @@
                     top.learun.clientdata.getAsync('custmerData', {
                         url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdMajorInfo',
                         key: value,
-                        keyId: 'id',
+                        keyId: 'majorno',
                         callback: function (_data) {
                             result = _data.majorname;
 
@@ -542,7 +542,7 @@
                     top.learun.clientdata.getAsync('custmerData', {
                         url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdMajorInfo',
                         key: value,
-                        keyId: 'id',
+                        keyId: 'majorno',
                         callback: function (_data) {
                             result = _data.majorname;
 

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

@@ -7722,6 +7722,7 @@
     <None Include="Properties\PublishProfiles\FolderProfile2.pubxml" />
     <None Include="Properties\PublishProfiles\FolderProfile3.pubxml" />
     <None Include="Properties\PublishProfiles\FolderProfile4.pubxml" />
+    <None Include="Properties\PublishProfiles\FolderProfile5.pubxml" />
     <None Include="Properties\PublishProfiles\learunadms6.1.pubxml" />
     <Content Include="Views\Utility\ListContentIndexLost.cshtml" />
   </ItemGroup>

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

@@ -624,7 +624,7 @@ a.name as ApartmentName,b.name as UnitName,c.Name as FloorName
                     floorInfo.dormitory = bed;
                     if (!string.IsNullOrEmpty(bed.StudentID))
                     {
-                        floorInfo.stuInfo = this.BaseRepository("CollegeMIS").FindEntity<StuInfoBasicEntity>(a => a.StuId == bed.StudentID);
+                        floorInfo.stuInfo = this.BaseRepository("CollegeMIS").FindEntity<StuInfoBasicEntity>(a => a.StuNo == bed.StudentID);
                     }
                     list.Add(floorInfo);
                 }