Merge branch '长阳分支中职' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 长阳分支中职

Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/Arrangelesson.cs

@@ -1,7 +1,9 @@
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Web;
+using Learun.Application.Base.SystemModule;
 using Learun.Application.Organization;
 using Learun.Application.TwoDevelopment.EducationalAdministration;
 using Learun.Util;
@@ -88,6 +90,7 @@ namespace Learun.Application.WebApi.Modules
 
         private StuSelectLessonListOfElectiveIBLL stuSelectLessonListOfElectiveIbll =
             new StuSelectLessonListOfElectiveBLL();
+        private AnnexesFileIBLL annexesFileIbll = new AnnexesFileBLL();
 
         private Response TranTest(dynamic _)
         {
@@ -150,7 +153,7 @@ namespace Learun.Application.WebApi.Modules
         }
         private Response GetAllUsers(dynamic _)
         {
-            var webrootpath= Config.GetValue("webrootpath");
+            var webrootpath = Config.GetValue("webrootpath");
             var result = userIbll.GetAllList().Where(m => !m.F_Account.Contains("System") && m.F_DeleteMark == 0 && m.F_EnabledMark == 1).Select(m => new
             {
                 m.F_UserId,
@@ -162,13 +165,31 @@ namespace Learun.Application.WebApi.Modules
                 m.F_Account,
                 Year = "20" + stuInfoBasicIbll.GetStuInfoBasicEntityByStuNo(m.F_Account)?.Grade,
                 m.F_IdentityCardNo,
-                F_HeadIcon= webrootpath + m?.F_HeadIcon
+                F_HeadIcon = webrootpath + m?.F_HeadIcon
             });
             return Success(result);
         }
         private Response GetAllStudents(dynamic _)
         {
+            var webrootpath = Config.GetValue("webrootpath");
             var result = stuInfoBasicIbll.GetAllList();
+            foreach (var item in result)
+            {
+                if (!string.IsNullOrEmpty(item.Photo))
+                {
+                    var annfile = annexesFileIbll.GetEntityByFolderId(item.Photo);
+                    if (annfile != null && annfile.F_FilePath != null)
+                    {
+                        item.Photo = webrootpath + item.Photo.Substring(item.Photo.IndexOf("Resource") - 1);
+                    }
+                    else
+                        item.Photo = "";
+                }
+                else
+                {
+                    item.Photo = "";
+                }
+            }
             return Success(result);
         }
         private Response GetDepartment(dynamic _)