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

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.js

@@ -130,7 +130,7 @@ var bootstrap = function ($, learun) {
             $('#EmpFullTimeNo').lrDataItemSelect({ code: 'EmpFullTime' });
             $('#ObtainWay').lrDataItemSelect({ code: 'ObtainWay' });
             //$('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' });
-            $('#PostRank').lrDataItemSelect({ code: 'BCdTitleOfTechPost', allowSearch: true });
+            $('#PostRank').lrDataItemSelect({ code: 'PostRank', allowSearch: true });
             $('#Photo').lrUploader();
             //最高学历
             $('#HighestRecord').lrDataItemSelect({ code: 'CollegeType', allowSearch: true });

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/ResourceFile/Index.cshtml

@@ -7,7 +7,7 @@
         <div class="lr-layout-wrap lr-layout-wrap-notitle" style="padding-top:10px;">
             <div class="lr-layout-body">
                 <ul class="lr-left-list" id="lr_left_list">
-                    <li data-value="allFile" class="lrlt active">所有文件</li>
+                    <li data-value="allFile" class="lrlt active">所有文件/文件夹</li>
                     <li data-value="allDocument" class="lrlt">文档</li>
                     <li data-value="allImage" class="lrlt">图片</li>
                     <li data-value="recycledFile" class="lrlt">回收站</li>

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

@@ -101,17 +101,17 @@ a.name as ApartmentName,b.name as UnitName,c.Name as FloorName
                 }
                 if (!queryParam["Dept"].IsEmpty())
                 {
-                    dp.Add("Dept", "%" + queryParam["Dept"].ToString() + "%", DbType.String);
+                    dp.Add("Dept", queryParam["Dept"].ToString(), DbType.String);
                     strSql.Append(" AND t.Dept=@Dept ");
                 }
                 if (!queryParam["Class"].IsEmpty())
                 {
-                    dp.Add("Class", "%" + queryParam["Class"].ToString() + "%", DbType.String);
+                    dp.Add("Class", queryParam["Class"].ToString(), DbType.String);
                     strSql.Append(" AND t.Class=@Class ");
                 }
                 if (!queryParam["Major"].IsEmpty())
                 {
-                    dp.Add("Major", "%" + queryParam["Major"].ToString() + "%", DbType.String);
+                    dp.Add("Major", queryParam["Major"].ToString(), DbType.String);
                     strSql.Append(" AND t.Major=@Major ");
                 }
                 if (!queryParam["Sex"].IsEmpty())