使用模板 和新增排序

performance/Performance.Services/AssessService.cs

@@ -159,11 +159,11 @@ public ApiResponse AddColumn(int assessID, int parentID, string columnName, int
                 if (centity == null)
                     return new ApiResponse(ResponseType.Fail, "考核项目父级ID无效");
             }
-            var clist = perforAscolumnsRepository.GetEntities(t => t.ParentID == parentID && t.AssessID == assessID && t.Sort >= sort);
+            var clist = perforAscolumnsRepository.GetEntities(t => t.ParentID == parentID && t.AssessID == assessID && t.Sort >= sort).OrderBy(t => t.Sort).ToList();
             if (clist != null && clist.Count > 0)
             {
-                //int atsort = sort;
-                clist.ForEach(t => t.Sort = t.Sort + 1);//clist.ForEach(t => { t.Sort = atsort + 1; atsort++; });
+                int atsort = sort;
+                clist.ForEach(t => { t.Sort = atsort + 1; atsort++; });
                 perforAscolumnsRepository.UpdateRange(clist.ToArray());
             }
             var column = new as_columns { AssessID = assessID, ParentID = parentID, ColumnName = columnName, Sort = sort };
@@ -320,7 +320,7 @@ public ApiResponse UseTemplate(int allotID, int assessID)
                         {
                             keyvalue.Add(item.TempColumnID, item.ID);
                         }
-                        columns = columns.Where(t => t.ParentID != null).ToList();
+                        columns = columns.Where(t => t.ParentID.HasValue && t.ParentID != 0).ToList();
                         columns?.ForEach(t => t.ParentID = keyvalue[t.ParentID]);
 
                         result = perforAscolumnsRepository.UpdateRange(columns.ToArray());