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 @@
- - 所有文件
+ - 所有文件/文件夹
- 文档
- 图片
- 回收站
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())