作者 yangfu

导入修改

@@ -220,7 +220,7 @@ func (srv ExcelDataService) ImportCompanyUser(importDataCommand *command.ImportD @@ -220,7 +220,7 @@ func (srv ExcelDataService) ImportCompanyUser(importDataCommand *command.ImportD
220 if err != nil { 220 if err != nil {
221 return nil, application.ThrowError(application.BUSINESS_ERROR, err.Error()) 221 return nil, application.ThrowError(application.BUSINESS_ERROR, err.Error())
222 } 222 }
223 - return srv.importResultWithHeader(excelImport.DataFields, result.FailRows, len(excelData)), nil 223 + return srv.importResultWithHeader(excelImport.DataFields, result.FailRows, len(users)), nil
224 } 224 }
225 225
226 func (srv ExcelDataService) ImportOrganization(importDataCommand *command.ImportDataCommand) (interface{}, error) { 226 func (srv ExcelDataService) ImportOrganization(importDataCommand *command.ImportDataCommand) (interface{}, error) {
@@ -255,7 +255,7 @@ func (srv ExcelDataService) ImportOrganization(importDataCommand *command.Import @@ -255,7 +255,7 @@ func (srv ExcelDataService) ImportOrganization(importDataCommand *command.Import
255 if err != nil { 255 if err != nil {
256 return nil, application.ThrowError(application.BUSINESS_ERROR, err.Error()) 256 return nil, application.ThrowError(application.BUSINESS_ERROR, err.Error())
257 } 257 }
258 - return srv.importResultWithHeader(excelImport.DataFields, result.FailRows, len(excelData)), nil 258 + return srv.importResultWithHeader(excelImport.DataFields, result.FailRows, len(items)), nil
259 } 259 }
260 260
261 // 导入结果 261 // 导入结果