排序修改

performance/Performance.Services/AssessService.cs

@@ -158,30 +158,27 @@ 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 && clist.Count > 0)
+            }
+            var column = 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 && clist.Count > 0)
+            {
+                if (column != null)
+                {
+                    clist.ForEach(t => t.Sort = t.Sort + 1);
+                    perforAscolumnsRepository.UpdateRange(clist.ToArray());
+                }
+                else
                 {
-                    if (centity != null)
+                    var exce = clist.OrderBy(t => t.Sort).FirstOrDefault().Sort - sort;
+                    if (exce > 1)
                     {
-                        clist.ForEach(t => t.Sort = t.Sort + 1);
+                        clist.ForEach(t => t.Sort = t.Sort - exce);
                         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);
-                return flag ? new ApiResponse(ResponseType.OK, model) : new ApiResponse(ResponseType.Fail);
             }
-            var column = new as_columns { AssessID = assessID, ParentID = parentID, ColumnName = columnName, Sort = sort };
+            column = new as_columns { AssessID = assessID, ParentID = parentID, ColumnName = columnName, Sort = sort };
             var result = perforAscolumnsRepository.Add(column);
             return result ? new ApiResponse(ResponseType.OK, column) : new ApiResponse(ResponseType.Fail);
         }