留学就业产品查询修改

Edu.Module.StudyAbroad/StudyAbroadModule.cs

@@ -61,7 +61,7 @@ namespace Edu.Module.StudyAbroad
             if (list != null && list.Count > 0)
             {
                 string ids = string.Join(",", list.Select(qitem => qitem.Id));
-                string countryIds = string.Join(",", list.Where(qitem=>!string.IsNullOrEmpty(qitem.TypeCountryId)).Select(qitem => qitem.TypeCountryId));
+                string countryIds = string.Join(",", list.Where(qitem=>!string.IsNullOrEmpty(qitem.TypeCountryId)).Select(qitem => qitem.TypeCountryId).Distinct());
                 List<RB_StudyaBroad_Preferential_ViewModel> preferentialList = new List<RB_StudyaBroad_Preferential_ViewModel>();
                 if (query.IsQPrice == 1)
                 {

Edu.WebApi/Controllers/StudyAbroad/StudyAbroadController.cs

@@ -202,8 +202,12 @@ namespace Edu.WebApi.Controllers.StudyAbroad
         [HttpPost]
         public ApiResult GetProductTypeList()
         {
-            var list = Common.Plugin.EnumHelper.EnumToList(typeof(StudyAbroadProductTypeEnum));
-            return ApiResult.Success(data: list);
+            var query = new RB_Studyabroad_Type_Extend()
+            {
+                Group_Id = base.UserInfo.Group_Id
+            };
+            var list = studyAbroadModule.GetStudyabroadTypeListModule(query);
+            return ApiResult.Success(data: list.Select(qitem => new { qitem.Id, qitem.Name }));
         }
 
         /// <summary>
@@ -231,22 +235,22 @@ namespace Edu.WebApi.Controllers.StudyAbroad
             var list = studyAbroadModule.GetStudyAbroadPageModule(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, query);
             foreach (var item in list)
             {
-                if (item.CreateBy > 0)
-                {
-                    item.CreateByName = UserReidsCache.GetUserLoginInfo(item.CreateBy)?.AccountName ?? "";
-                }
+                //if (item.CreateBy > 0)
+                //{
+                //    item.CreateByName = UserReidsCache.GetUserLoginInfo(item.CreateBy)?.AccountName ?? "";
+                //}
                 if (item.UpdateBy > 0)
                 {
                     item.UpdateByName = UserReidsCache.GetUserLoginInfo(item.UpdateBy)?.AccountName ?? "";
                 }
-                if (item.DirectorId > 0)
-                {
-                    item.DirectorName = UserReidsCache.GetUserLoginInfo(item.DirectorId)?.AccountName ?? "";
-                }
-                if (item.ManagerId > 0)
-                {
-                    item.ManagerName = UserReidsCache.GetUserLoginInfo(item.ManagerId)?.AccountName ?? "";
-                }
+                //if (item.DirectorId > 0)
+                //{
+                //    item.DirectorName = UserReidsCache.GetUserLoginInfo(item.DirectorId)?.AccountName ?? "";
+                //}
+                //if (item.ManagerId > 0)
+                //{
+                //    item.ManagerName = UserReidsCache.GetUserLoginInfo(item.ManagerId)?.AccountName ?? "";
+                //}
                 result.Add(new
                 {
                     item.Id,