Merge branch '塔里木分支' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 塔里木分支

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_FixAssetsApply/FormView.js

@@ -90,7 +90,7 @@ var bootstrap = function ($, learun) {
                     }
                 }
             });
-            $('#Files').lrUploader();
+            $('#Files').lrUploader({ isUpload: false});
         },
         initData: function () {
             if (!!keyValue) {

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_InvigilateTeacher/Exam_InvigilateTeacherService.cs

@@ -81,13 +81,10 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                     empSql += $@"  and EPLId = T.EPLId FOR XML PATH('') ), 1, 1, '') AS empno FROM Exam_ExamPlanRoom AS T
                     where EPLId ='{queryParam["EPLId"].ToString()}'";
                     var obj = this.BaseRepository("CollegeMIS").FindList<Exam_ExamPlanRoomEntity>(empSql).Select(x => x.EmpNo).Distinct().ToList();
-                    if (!string.IsNullOrEmpty(obj[0]))
+                    if (obj.Count() > 0)
                     {
-                        //if (obj[0].IsEmpty())
-                        //{
                         var empNo = string.Join("','", obj[0].ToString().Split(',').Distinct());
                         strSql.Append($" AND t.EmpNo not in ('{empNo}')");
-                        //}
                     }
 
                     //筛选掉考试时间冲突的老师和专业课的代课老师