Merge branch 'master' of http://gitlab.oytour.com/Kui2/education

Edu.Module.Public/ClassConfigModule.cs

@@ -43,13 +43,14 @@ namespace Edu.Module.Public
         public RB_Class_Config_ViewModel GetClassConfigModule(RB_Class_Config_ViewModel query)
         {
             var model = class_ConfigRepository.GetClassConfigRepository(query);
-            if (!string.IsNullOrWhiteSpace(model.AdminiIds))//查询管理员
+
+            List<int> AdminiIds = Common.ConvertHelper.StringToList(model.AdminiIds);
+            if (AdminiIds!=null&& AdminiIds.Count>0)//查询管理员
             {
                 var empList = accountRepository.GetEmployeeListRepository(new Edu.Model.ViewModel.User.Employee_ViewModel()
                 {
-
                     Group_Id = query.Group_Id,
-                    QIds = model.AdminiIds
+                    QIds = string.Join(",", AdminiIds)
                 });
 
                 if (empList != null && empList.Any())

Edu.WebApi/Controllers/Public/PublicController.cs

@@ -492,8 +492,16 @@ namespace Edu.WebApi.Controllers.Public
                 BasicClassNum = base.ParmJObj.GetInt("BasicClassNum"),
                 BasicMinutes = base.ParmJObj.GetInt("BasicMinutes"),
                 BasicHours = base.ParmJObj.GetInt("BasicHours"),
-                AdminiIds = base.ParmJObj.GetStringValue("AdminiIds")
             };
+            List<int> AdminiIds = Common.ConvertHelper.StringToList(base.ParmJObj.GetStringValue("AdminiIds"));
+            if (AdminiIds != null && AdminiIds.Count > 0)
+            {
+                extModel.AdminiIds = string.Join(",", AdminiIds);
+            }
+            else
+            {
+                extModel.AdminiIds = "";
+            }
             extModel.Group_Id = base.UserInfo.Group_Id;
             extModel.UpdateBy = base.UserInfo.Id;
             extModel.UpdateTime = DateTime.Now;