新增考核项 排序

performance/Performance.Services/AssessService.cs

@@ -158,11 +158,24 @@ public ApiResponse AddColumn(int assessID, int parentID, string columnName, int
                 var centity = perforAscolumnsRepository.GetEntity(t => t.ID == parentID);
                 if (centity == null)
                     return new ApiResponse(ResponseType.Fail, "考核项目父级ID无效");
+                centity = perforAscolumnsRepository.GetEntity(t => t.ParentID == parentID && t.AssessID == assessID && t.Sort == sort);
                 var clist = perforAscolumnsRepository.GetEntities(t => t.ParentID == parentID && t.AssessID == assessID && t.Sort >= sort);
-                if (clist != null)
+                if (clist != null && clist.Count > 0)
                 {
-                    clist.ForEach(t => t.Sort = t.Sort + 1);
-                    perforAscolumnsRepository.UpdateRange(clist.ToArray());
+                    if (centity != null)
+                    {
+                        clist.ForEach(t => t.Sort = t.Sort + 1);
+                        perforAscolumnsRepository.UpdateRange(clist.ToArray());
+                    }
+                    else
+                    {
+                        var exce = clist.OrderBy(t => t.Sort).FirstOrDefault().Sort - sort;
+                        if (exce > 1)
+                        {
+                            clist.ForEach(t => t.Sort = t.Sort - exce);
+                            perforAscolumnsRepository.UpdateRange(clist.ToArray());
+                        }
+                    }
                 }
                 var model = new as_columns { AssessID = assessID, ParentID = parentID, ColumnName = columnName, Sort = sort };
                 var flag = perforAscolumnsRepository.Add(model);