Merge branch 'v2020morge' into v2020morge-xlsx

8106a796 · lcx · e578045e · fe4853ca · 8106a796
Commit 8106a796 authored Feb 24, 2021 by lcx
Hide whitespace changes
Inline Side-by-side

Showing with 1 additions and 1 deletions

performance/Performance.Api/Controllers/TemplateController.cs
+1 -1

No files found.
--- a/performance/Performance.Api/Controllers/TemplateController.cs
+++ b/performance/Performance.Api/Controllers/TemplateController.cs
@@ -179,7 +179,7 @@ public ApiResponse Prejudge([FromRoute] int allotId)
            if (!string.IsNullOrEmpty(filePath) && FileHelper.IsExistFile(filePath))
            {
                var data = configService.CheckHasNewDepartmentOrCategory(allotId);
-                return new ApiResponse(ResponseType.Fail, data);
+                return new ApiResponse(ResponseType.OK, new { haserror = (data != null && data.Any()), data });
            }
            return new ApiResponse(ResponseType.OK);
        }