diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/Log/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/Log/Index.cshtml
index dac19e036..e87ac46bf 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/Log/Index.cshtml
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/Log/Index.cshtml
@@ -9,7 +9,7 @@
- 登录日志
- 访问日志
- - 操作日志
+ @*- 操作日志
*@
- 异常日志
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicService.cs
index e9a943cb4..f95333a22 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicService.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicService.cs
@@ -181,7 +181,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
{
return data.Photo;
}
-
+
return "";
}
catch (Exception ex)
@@ -296,7 +296,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
{
var stuList = this.BaseRepository("CollegeMIS")
.FindList(a => a.MajorNo == MajorNo)
- .Where(a => a.DiplomaNo == null || a.DiplomaNo == "");
+ .Where(a => a.DiplomaNo == null || a.DiplomaNo == "" && a.FinishSchoolMark == "1");
if (stuList.Count() > 0)
{
foreach (var stuInfo in stuList)