diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/ResourceFile/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/ResourceFile/Index.js
index 0653a3830..07317e713 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/ResourceFile/Index.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/ResourceFile/Index.js
@@ -303,10 +303,12 @@ var bootstrap = function ($, learun) {
break;
case "myShare":
_url = "/LR_OAModule/ResourceFile/GetMyShareListJson";
+ $(".crumb-path").find('[data-folderid=allfile]').html('我的共享');
$("#lr-cancelshare").show();
break;
case "othersShare":
_url = "/LR_OAModule/ResourceFile/GetOthersShareListJson";
+ $(".crumb-path").find('[data-folderid=allfile]').html('他人共享');
//$gridTable.setGridParam().showCol("CreateUserName");
$("#lr-download").show();
break;
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/wsbsdt.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/wsbsdt.png
new file mode 100644
index 000000000..9bcf6dce2
Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/wsbsdt.png differ
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminDefault.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminDefault.cshtml
index e7a14d9b8..09c3a3157 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminDefault.cshtml
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminDefault.cshtml
@@ -3,6 +3,19 @@
Layout = "~/Views/Shared/_Admin.cshtml";
}
@Html.AppendCssFile("/Views/Home/AdminDefault/index.css")
+
@@ -45,6 +58,9 @@
中层请假归档 @ViewBag.UnfileLeaveZC 条
共 @ViewBag.UnreadNum 条
+
+
+
@* 即时通讯窗体 *@
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/Index.cshtml
index c0e834ff3..bef8570ee 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/Index.cshtml
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/Index.cshtml
@@ -713,7 +713,7 @@
@if (ViewBag.UserType == "学生")
{
-
西昌民族幼儿师范高等专科学校
+
长阳土家族自治县职业教育中心
选修课选课流程
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/IndexForDC.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/IndexForDC.cshtml
index 3047b8b85..d61d6b063 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/IndexForDC.cshtml
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/IndexForDC.cshtml
@@ -742,8 +742,8 @@
@if (ViewBag.UserType == "学生")
{
-
西昌民族幼儿师范高等专科学校
-
+ 长阳土家族自治县职业教育中心
+
选修课选课流程
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 fd28eb6be..aa608c1ad 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
@@ -737,7 +737,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
bedInfo.Dept = stuInfo.DeptNo;
bedInfo.Major = stuInfo.MajorNo;
bedInfo.Class = stuInfo.ClassNo;
- bedInfo.Sex = stuInfo.GenderNo != null && stuInfo.GenderNo.Value ? "男" : "女";
+ bedInfo.Sex = Convert.ToString(stuInfo.GenderNo);
this.BaseRepository("CollegeMIS").Update(bedInfo);
return true;
}