BUG

parent 8dfdcc3d
......@@ -17,7 +17,10 @@ public class SetAssessRequestValidator : AbstractValidator<SetAssessRequest>
public SetAssessRequestValidator()
{
RuleFor(t => t.AssessID).NotNull().GreaterThan(0);
RuleFor(t => t.Department).NotNull().Must(p => p != null && p.Count > 0 && !p.Any(t => t.Trim() != ""));
RuleFor(t => t.Department).NotNull().Must(p =>
{
return p != null && p.Count > 0 && !p.Any(t => t.Trim() == "");
});
}
}
}
......@@ -46,8 +46,9 @@ public ApiResponse AddAssess(int allotID, string assessName)
var entity = perforAsassessRepository.GetEntities(t => t.AllotID == allotID && t.AssessName == assessName);
if (entity != null && entity.Count > 0)
return new ApiResponse(ResponseType.Fail, "考核类别重复");
var result = perforAsassessRepository.Add(new as_assess { AllotID = allotID, AssessName = assessName });
return result ? new ApiResponse(ResponseType.OK) : new ApiResponse(ResponseType.Fail);
var assess = new as_assess { AllotID = allotID, AssessName = assessName };
var result = perforAsassessRepository.Add(assess);
return result ? new ApiResponse(ResponseType.OK, assess) : new ApiResponse(ResponseType.Fail);
}
/// <summary>
......@@ -64,7 +65,7 @@ public ApiResponse EditAssess(int assessID, string assessName)
entity.AssessName = assessName;
var result = perforAsassessRepository.Update(entity);
return result ? new ApiResponse(ResponseType.OK) : new ApiResponse(ResponseType.Fail);
return result ? new ApiResponse(ResponseType.OK, entity) : new ApiResponse(ResponseType.Fail);
}
/// <summary>
......@@ -134,9 +135,9 @@ public ApiResponse AddColumn(int assessID, int parentID, string columnName)
if (centity == null)
return new ApiResponse(ResponseType.Fail, "考核项目父级ID无效");
}
var result = perforAscolumnsRepository.Add(new as_columns { AssessID = assessID, ParentID = parentID, ColumnName = columnName });
return result ? new ApiResponse(ResponseType.OK) : new ApiResponse(ResponseType.Fail);
var column = new as_columns { AssessID = assessID, ParentID = parentID, ColumnName = columnName };
var result = perforAscolumnsRepository.Add(column);
return result ? new ApiResponse(ResponseType.OK, column) : new ApiResponse(ResponseType.Fail);
}
/// <summary>
......@@ -152,7 +153,7 @@ public ApiResponse EditColumn(int columnID, string columnName)
return new ApiResponse(ResponseType.Fail, "考核项目父级ID无效");
entity.ColumnName = columnName;
var result = perforAscolumnsRepository.Update(entity);
return result ? new ApiResponse(ResponseType.OK) : new ApiResponse(ResponseType.Fail);
return result ? new ApiResponse(ResponseType.OK, entity) : new ApiResponse(ResponseType.Fail);
}
/// <summary>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment