删除参数定义

TEAMModelOS/Controllers/Core/ClassroomStudentController.cs

@@ -84,7 +84,7 @@ namespace TEAMModelOS.Controllers.Core
         public async Task<BaseJosnRPCResponse> Exit(JosnRPCRequest<List<ClassroomStudent>> request)
         {
             JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
-            if (ValidateHelper.IsValid(request.@params))
+            if (ValidateHelper.IsValid(request.@params) && request.@params.Count>0)
             {
                 List<ClassroomStudent> students = request.@params;
                 List<ClassroomStudent> classroomStudents1 = new List<ClassroomStudent>();

TEAMModelOS/Controllers/Core/SchoolUserController.cs

@@ -84,22 +84,23 @@ namespace TEAMModelOS.Controllers.Core
         public async Task<BaseJosnRPCResponse> RmvSchoolUser(JosnRPCRequest<Dictionary<string, object>> request)
         {
             JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
-            request.@params.TryGetValue("schoolCode", out object schoolCode);
-            request.@params.TryGetValue("TEAMModelIds", out object TEAMModelIds);
-            //取得已加入該校的使用者 (joinStatus=1: [加入狀態]  1:已加入)
-            Dictionary<string, object> userDict = new Dictionary<string, object>
+            if (request.@params.TryGetValue("schoolCode", out object schoolCode) && request.@params.TryGetValue("TEAMModelIds", out object TEAMModelIds)) 
             {
-                { "schoolCode",  schoolCode.ToString()},
-                { "TEAMModelId",  TEAMModelIds},
-                { "joinStatus",  1}
-            };
-            List<SchoolUser> suList = await _cosmosrepository.FindByDict<SchoolUser>(userDict);
-            //移除
-            if (suList.Count > 0)
-            {
-                foreach (SchoolUser su in suList)
+                //取得已加入該校的使用者 (joinStatus=1: [加入狀態]  1:已加入)
+                Dictionary<string, object> userDict = new Dictionary<string, object>
+                {
+                    { "schoolCode",  schoolCode.ToString()},
+                    { "TEAMModelId",  TEAMModelIds},
+                    { "joinStatus",  1}
+                };
+                List<SchoolUser> suList = await _cosmosrepository.FindByDict<SchoolUser>(userDict);
+                //移除
+                if (suList.Count > 0)
                 {
-                    await _cosmosrepository.DeleteAsync(su);
+                    foreach (SchoolUser su in suList)
+                    {
+                        await _cosmosrepository.DeleteAsync(su);
+                    }
                 }
             }
             return builder.build();

TEAMModelOS/Controllers/Courses/CourseController.cs

@@ -4,6 +4,7 @@ using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
+using Org.BouncyCastle.Ocsp;
 using TEAMModelOS.SDK.Context.Exception;
 using TEAMModelOS.SDK.Extension.DataResult.JsonRpcRequest;
 using TEAMModelOS.SDK.Extension.DataResult.JsonRpcResponse;
@@ -60,16 +61,22 @@ namespace TEAMModelOS.Controllers.Courses
         public async Task<BaseJosnRPCResponse> DeleteCourse (JosnRPCRequest<Dictionary<string, object>> request) 
         {
             JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
-            Dictionary<string, object> dict = request.@params;
-            List<Course> Course = await _cosmos.FindByDict<Course>(dict);
-            await _cosmos.DeleteAll<Course>(Course);
-            if (Course.Count > 0)
+            if (request.@params.Keys.Count > 0)
             {
-                builder.Data("删除成功");
+
+                List<Course> Course = await _cosmos.FindByDict<Course>(request.@params);
+                await _cosmos.DeleteAll<Course>(Course);
+                if (Course.Count > 0)
+                {
+                    builder.Data("删除成功");
+                }
+                else
+                {
+                    throw new BizException("删除失败", ResponseCode.FAILED);
+                }
             }
-            else
-            {
-                throw new BizException("删除失败", ResponseCode.FAILED);
+            else {
+                throw new BizException("参数未定义", ResponseCode.FAILED);
             }
             return builder.build();
         }

TEAMModelOS/Controllers/Syllabus/KnowledgeController.cs

@@ -327,28 +327,33 @@ namespace TEAMModelOS.Controllers.Syllabus
 
         private async Task<List<T>> Delete<T>(JosnRPCRequest<Dictionary<string, object>> request, JsonRPCResponseBuilder builder) where T : ID
         {
-            List<T> schoolBlocks = await _cosmos.FindByDict<T>(request.@params);
-            Type t = typeof(T);
-            List<T> list = new List<T>();
-            if (schoolBlocks.IsNotEmpty())
+            List<T> schoolBlocks = null;
+            if (request.@params.Keys.Count > 0)
             {
-                List<IdPk> idPks = await _cosmos.DeleteAll<T>(schoolBlocks);
-                if (idPks.IsNotEmpty())
+                  schoolBlocks = await _cosmos.FindByDict<T>(request.@params);
+                Type t = typeof(T);
+                List<T> list = new List<T>();
+                if (schoolBlocks.IsNotEmpty())
                 {
-                    builder.Data("删除成功");
-                }
-                else {
-                    throw new BizException("删除失败", ResponseCode.FAILED);
-                    
+                    List<IdPk> idPks = await _cosmos.DeleteAll<T>(schoolBlocks);
+                    if (idPks.IsNotEmpty())
+                    {
+                        builder.Data("删除成功");
+                    }
+                    else
+                    {
+                        throw new BizException("删除失败", ResponseCode.FAILED);
+
+                    }
+
                 }
+                else
+                {
+                    //throw new BizException("未找到对应删除数据", ResponseCode.NOT_FOUND);
 
+                }
             }
-            else
-            {
-                //throw new BizException("未找到对应删除数据", ResponseCode.NOT_FOUND);
-               
-            }
-
+            else { throw new BizException("参数未定义", ResponseCode.FAILED); }
             return schoolBlocks;
         }
     }

TEAMModelOS/Controllers/Syllabus/ResourceController.cs

@@ -138,7 +138,7 @@ namespace TEAMModelOS.Controllers.Syllabus
 
         private async Task<List<T>> Delete<T>(JosnRPCRequest<Dictionary<string, object>> request, JsonRPCResponseBuilder builder)where T:ID
         {
-            if (request.@params.IsNotEmpty())
+            if (request.@params.IsNotEmpty()&& request.@params.Keys.Count>0)
             {
                 List<T> schoolBlocks = await _cosmos.FindByDict<T>(request.@params);
                 Type t = typeof(T);

TEAMModelOS/Controllers/Syllabus/SyllabusController.cs

@@ -70,16 +70,24 @@ namespace TEAMModelOS.Controllers.Syllabus
         public async Task<BaseJosnRPCResponse> Delete(JosnRPCRequest<Dictionary<string, object>> request)
         {
             JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
-            List<Syllabuses> syllabuses = await syllabusService.DeleteSyllabus(request.@params);
-
-            if (syllabuses.IsNotEmpty())
+            if (request.@params.Keys.Count > 0)
             {
-                return builder.Data(syllabuses).build();
-            }
-            else { 
-                return builder.Data("全部删除成功").build();
+                List<Syllabuses> syllabuses = await syllabusService.DeleteSyllabus(request.@params);
+
+                if (syllabuses.IsNotEmpty())
+                {
+                    return builder.Data(syllabuses).build();
+                }
+                else
+                {
+                    return builder.Data("全部删除成功").build();
 
+                }
+            }
+            else {
+                throw new BizException("参数未定义");
             }
+            
             //else
             //{
             //    return builder.Data(null).build();