Merge branch 'v2020morge' into v2020morge-xlsx

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);
         }