update

TEAMModelOS.SDK/Models/Cosmos/Common/Activity.cs

@@ -109,6 +109,10 @@ namespace TEAMModelOS.SDK.Models
         public string name { get; set; } = "教师专业化发展服务平台";
         public string logo { get; set; }
         public List<ActivityBanner> banners { get; set; } = new List<ActivityBanner>();
+        /// <summary>
+        /// 是否允许创建公开的活动
+        /// </summary>
+        public int allowPublic { get; set; } = 0;
 
     }
     public class ActivityBanner { 
@@ -250,6 +254,7 @@ namespace TEAMModelOS.SDK.Models
         /// 模板来源 name 
         /// </summary>
         public string sourceName { get; set; }
+        public string desc { get; set; }
     }
     public class RuleConfig {
         public string id { get; set; }
@@ -263,6 +268,7 @@ namespace TEAMModelOS.SDK.Models
 
     }
     public class ReviewRuleTree {
+        public string id { get; set; }
 
         [Required(ErrorMessage = "Required")]
         public string name { get; set; }

TEAMModelOS.SDK/Models/Service/Common/ActivityService.cs

@@ -21,6 +21,7 @@ namespace TEAMModelOS.SDK
                 code="ReviewRule-disposable",
                 pk="ReviewRule",
                 name=reviewRuleTree.name,
+                desc=reviewRuleTree.desc,
                 owner=activity.owner,
                 type="disposable",
                 configs=nodes,

TEAMModelOS/Controllers/Common/ActivityController.cs

@@ -121,7 +121,7 @@ namespace TEAMModelOS.Controllers
                                 }
                                 if (_scope.GetString().Equals("school", StringComparison.OrdinalIgnoreCase))
                                 {
-                                    route=websiteId;
+                                    route = websiteId;
                                 }
                                 if (!string.IsNullOrWhiteSpace(route))
                                 {
@@ -235,7 +235,6 @@ namespace TEAMModelOS.Controllers
             {
                 (string tmdid, _, _, string school) = HttpContext.GetAuthTokenInfo();
                 if (!request.TryGetProperty("grant_type", out JsonElement grant_type)) return BadRequest();
-
                 var client = _azureCosmos.GetCosmosClient();
                 switch (true)
                 {
@@ -578,10 +577,12 @@ namespace TEAMModelOS.Controllers
                                         var tree = ActivityService.ListToTree(reviewRuleDB.configs);
                                         reviewRule=new ReviewRuleTree
                                         {
+                                            id=reviewRuleDB.id,
                                             name= reviewRuleDB.name,
                                             owner= reviewRuleDB.owner,
                                             sourceName= reviewRuleDB.sourceName,
-                                            trees=tree
+                                            trees=tree,
+                                            desc=reviewRuleDB.desc
                                         };
                                     }
                                 }
@@ -598,7 +599,8 @@ namespace TEAMModelOS.Controllers
                             {
                                 var tree = ActivityService.ListToTree(item.configs);
                                 ReviewRuleTree reviewRule=new ReviewRuleTree
-                                {
+                                {   id=item.id,
+                                    desc=item.desc,
                                     name= item.name,
                                     owner= item.owner,
                                     sourceName= item.sourceName,
@@ -609,6 +611,7 @@ namespace TEAMModelOS.Controllers
                             }
                             return Ok(new { reviewRules });
                         }
+                    //删除
                     case bool when $"{grant_type}".Equals("school-confirm", StringComparison.OrdinalIgnoreCase):
                         {
                             if (!request.TryGetProperty("activityId", out JsonElement _activityId)) return BadRequest();