Compare commits

..

No commits in common. "7989dbd0f6aa05fdc16d777b9e0a602da93b14ac" and "0cce7c65274b83d263f895078daf7122864a855d" have entirely different histories.

View File

@ -499,7 +499,7 @@ namespace APT.SK.WebApi.Controllers.Api
var dataTables = FileUtils.ReadExcelByOledb(filePath, startRowIndexs); var dataTables = FileUtils.ReadExcelByOledb(filePath, startRowIndexs);
string Msg = string.Empty; string Msg = string.Empty;
bool isOK = InsertModel5(dataTables.Tables[0], orgId, ref Msg); bool isOK = InsertModel2(dataTables.Tables[0], orgId, ref Msg);
try try
{ {
@ -1872,12 +1872,6 @@ namespace APT.SK.WebApi.Controllers.Api
} }
} }
} }
if (!string.IsNullOrEmpty(Msg))
{
throw new Exception(Msg);
}
else
{
UnifiedCommit(() => UnifiedCommit(() =>
{ {
if (setLists != null && setLists.Any()) if (setLists != null && setLists.Any())
@ -1888,7 +1882,6 @@ namespace APT.SK.WebApi.Controllers.Api
BantchAddEntityNoCommit(setUserLists); BantchAddEntityNoCommit(setUserLists);
}); });
Msg = "导入成功!"; Msg = "导入成功!";
}
return true; return true;
} }
} }