From d597ad146fa6cb08eb66f1a1c8cf12affc90982e Mon Sep 17 00:00:00 2001
From: ndbs <nabs@LAPTOP-FJ5VQJ6J>
Date: Mon, 14 Mar 2022 09:35:07 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=95=99=E5=B8=88=E8=81=8C=E7=BA=A7?=
 =?UTF-8?q?=E4=B8=BA=E7=A9=BA=20=E6=96=87=E4=BB=B6=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=A4=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Areas/EducationalAdministration/Views/EmpInfo/Form.js       | 2 +-
 .../Areas/LR_OAModule/Views/ResourceFile/Index.cshtml           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.js
index c61bdd0ad..3d13b0704 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.js	
+++ b/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 });
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/ResourceFile/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/ResourceFile/Index.cshtml
index fbc8fc698..c7ae00fc7 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/ResourceFile/Index.cshtml	
+++ b/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>

From 1e56c6d7d33da9602be1d5c28881963bf178f0bd Mon Sep 17 00:00:00 2001
From: zhangli <1109134334@qq.com>
Date: Mon, 14 Mar 2022 09:36:22 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AE=BF=E8=88=8D?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=97=A0=E6=B3=95=E6=A0=B9=E6=8D=AE=E7=B3=BB?=
 =?UTF-8?q?=E9=83=A8=E3=80=81=E4=B8=93=E4=B8=9A=E3=80=81=E7=8F=AD=E7=BA=A7?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Accommodation/AccommodationService.cs                   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Accommodation/AccommodationService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Accommodation/AccommodationService.cs
index 996ada2f3..ade272d6d 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Accommodation/AccommodationService.cs	
+++ b/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())