Merge branch '西昌分支' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 西昌分支

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/Log/Index.cshtml

@@ -9,7 +9,7 @@
                 <ul class="lr-left-list" id="lr_left_list">
                     <li class="active  lrlt" data-value="1">登录日志</li>
                     <li data-value="2" class="lrlt" >访问日志</li>
-                    <li data-value="3" class="lrlt" >操作日志</li>
+                    @*<li data-value="3" class="lrlt" >操作日志</li>*@
                     <li data-value="4" class="lrlt" >异常日志</li>
                 </ul>
             </div>

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<StuInfoBasicEntity>(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)