diff --git a/YLErpDAL/YLErpDAL.csproj b/YLErpDAL/YLErpDAL.csproj index 437f62a6..07cbcda8 100644 --- a/YLErpDAL/YLErpDAL.csproj +++ b/YLErpDAL/YLErpDAL.csproj @@ -40,10 +40,10 @@ - + - - + + diff --git a/YLErpWeb/Controllers/tradeController.cs b/YLErpWeb/Controllers/tradeController.cs index 827bc8a6..f0f5728e 100644 --- a/YLErpWeb/Controllers/tradeController.cs +++ b/YLErpWeb/Controllers/tradeController.cs @@ -7055,6 +7055,10 @@ namespace YLErp.Web.Controllers public JsonResult BatchDownloadEodPositionRisks(EodPositionRisksReq req) { + req.BookIds = AssetUnitModel.IntersectAssetUnits(req.AssetIdGroupList, req.BookIds).ToList(); + req.UserAssets = CurUser.GetAssetUnitIds(); + req.UserClients = CurUser.GetClientIdsByCurUser(CurUser.交易管理_查看所有交易); + if (CurUser.交易管理_查看所有交易) { req.UserClients.Clear(); } if (!new EodPositionRisksQueryService(CurUser).BatchDownloadEodPositionRisks(req)) { return JsonError("线程正在被占用");