wyw/mh_jy_safe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: wyw:7989dbd0f6aa05fdc16d777b9e0a602da93b14ac
Branches Tags
wyw:master
..
compare: wyw:0cce7c65274b83d263f895078daf7122864a855d
Branches Tags
wyw:master

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

1 changed files with 10 additions and 17 deletions
Show Stats Expand all files Collapse all files

27
APT.MicroApi/APT.SK.WebApi/Controllers/Api/CheckSetController.cs
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,23 +1872,16 @@ namespace APT.SK.WebApi.Controllers.Api
} }
} }
} }
if (!string.IsNullOrEmpty(Msg)) UnifiedCommit(() =>
{
throw new Exception(Msg);
}
else
{ {
UnifiedCommit(() => if (setLists != null && setLists.Any())
{ BantchAddEntityNoCommit(setLists);
if (setLists != null && setLists.Any()) if (setContentLists != null && setContentLists.Any())
BantchAddEntityNoCommit(setLists); BantchAddEntityNoCommit(setContentLists);
if (setContentLists != null && setContentLists.Any()) if (setUserLists != null && setUserLists.Any())
BantchAddEntityNoCommit(setContentLists); BantchAddEntityNoCommit(setUserLists);
if (setUserLists != null && setUserLists.Any()) });
BantchAddEntityNoCommit(setUserLists); Msg = "导入成功！";
});
Msg = "导入成功！";
}
return true; return true;
} }
} }