update

TEAMModelOS.SDK/Models/Service/KnowledgeService.cs

@@ -10,14 +10,14 @@ namespace TEAMModelOS.SDK.Models.Service
 {
     public  sealed class KnowledgeService
     {
-        public static List<PointNode> TreeToList(List<PointTree> trees, List<PointNode> nodes, List<Block> blocks,HashSet<string> points)
+        public static List<PointNode> TreeToList(List<PointTree> trees, List<PointNode> nodes/*, List<Block> blocks,HashSet<string> points*/)
         {
             List<PointNode> list = new List<PointNode>();
             trees.ForEach(x => {
                 List<string> cids = new List<string>();
                 if (x.nodes.IsNotEmpty())
                 {
-                    x.nodes.ForEach(y => { cids.Add(y.id); points.Add(y.name); y.pid=x.id; });
+                    x.nodes.ForEach(y => { cids.Add(y.id); /*points.Add(y.name); */y.pid=x.id; });
                 }
                 var node = new PointNode
                 {
@@ -29,8 +29,8 @@ namespace TEAMModelOS.SDK.Models.Service
                     link = x.link,
                 };
                 list.Add(node);
-                blocks.Add(new Block { name= x.name,points=x.nodes.Select(x=>x.name).ToList() });
-                points.Add(x.name);
+                //blocks.Add(new Block { name= x.name,points=x.nodes.Select(x=>x.name).ToList() });
+                //points.Add(x.name);
             });
            
             nodes.AddRange(list);
@@ -39,7 +39,7 @@ namespace TEAMModelOS.SDK.Models.Service
             {
                 if (null != tree.nodes && tree.nodes.Count > 0)
                 {
-                    TreeToList(tree.nodes, nodes, blocks, points);
+                    TreeToList(tree.nodes, nodes/*, blocks, points*/);
                 }
             }
             return nodes;

TEAMModelOS/Controllers/Both/KnowledgeController.cs

@@ -65,10 +65,10 @@ namespace TEAMModelOS.Controllers.Both
 
             string code = string.Empty;
             Knowledge old =  null;
-            var blocks = new List<Block>(); 
-            var points = new HashSet<string>();
+            //var blocks = new List<Block>(); 
+            //var points = new HashSet<string>();
             var nodes = new List<PointNode>();
-            KnowledgeService.TreeToList(knowledge.tree, nodes, blocks, points);
+            KnowledgeService.TreeToList(knowledge.tree, nodes);
             if (knowledge.scope.Equals("school"))
             {
                 if (!string.IsNullOrWhiteSpace(knowledge.subjectId)  && !string.IsNullOrWhiteSpace(knowledge.periodId))
@@ -84,23 +84,23 @@ namespace TEAMModelOS.Controllers.Both
                     if (old!=null)
                     {
                         knowledge.id = old.id;
-                        foreach (var p in old.points) { 
-                            points.Add(p);
-                        }
-                        foreach (var b in old.blocks) {
-                            var bks=  blocks.FindAll(x => x.name.Equals(b.name));
-                            if (bks.IsNotEmpty())
-                            {
-                                foreach (var bk in bks)
-                                {
-                                    bk.points.AddRange(b.points);
-                                    bk.points= bk.points.Distinct().ToList();
-                                }
-                            }
-                            else {
-                                blocks.Add(b);
-                            }
-                        }
+                        //foreach (var p in old.points) { 
+                        //    points.Add(p);
+                        //}
+                        //foreach (var b in old.blocks) {
+                        //    var bks=  blocks.FindAll(x => x.name.Equals(b.name));
+                        //    if (bks.IsNotEmpty())
+                        //    {
+                        //        foreach (var bk in bks)
+                        //        {
+                        //            bk.points.AddRange(b.points);
+                        //            bk.points= bk.points.Distinct().ToList();
+                        //        }
+                        //    }
+                        //    else {
+                        //        blocks.Add(b);
+                        //    }
+                        //}
                     }
                     else
                     {
@@ -114,9 +114,9 @@ namespace TEAMModelOS.Controllers.Both
                         periodId=knowledge.periodId,
                         subjectId   =knowledge.subjectId,
                         scope=knowledge.scope,
-                        blocks=blocks,
+                        //blocks=blocks,
                         pk="Knowledge",
-                        points=points.ToList(),
+                       // points=points.ToList(),
                         nodes=nodes,
                         owner=knowledge.owner,
                     };
@@ -142,9 +142,9 @@ namespace TEAMModelOS.Controllers.Both
                     periodId=knowledge.periodId,
                     subjectId   =knowledge.subjectId,
                     scope=knowledge.scope,
-                    blocks=blocks,
+                    //blocks=blocks,
                     pk="Knowledge",
-                    points=points.ToList(),
+                   // points=points.ToList(),
                     nodes=nodes,
                     owner=knowledge.owner,
                 };

TEAMModelOS/Controllers/Both/PaperController.cs

@@ -292,7 +292,7 @@ namespace TEAMModelOS.Controllers
                 else
                 {
                     string tbname = paper.scope.Equals("private") ? "Teacher" : "School";
-                    QueryDefinition query = new QueryDefinition(@"select value c from  c where c.name=@name").WithParameter("@name", paper.name);
+                    QueryDefinition query = new QueryDefinition(@"select value c from  c where c.name=@name and c.id <>@id").WithParameter("@name", paper.name).WithParameter("@id", paper.id); ;
                     List<Paper> papers = new List<Paper>();
                     await foreach (var item in client.GetContainer(Constant.TEAMModelOS, tbname).GetItemQueryIterator<Paper>(query, requestOptions: new QueryRequestOptions { PartitionKey = new PartitionKey(paper.code) }))
                     {