Commit 7d99911e by 陶然

优化结算创建时传入了Owner就使用传入的信息,若没有传入则赋值当前登录人部门信息

parent 6aeb9d9e
...@@ -37,8 +37,8 @@ ...@@ -37,8 +37,8 @@
<Reference Include="Kivii.Core.V4.5, Version=5.6.2022.5000, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Kivii.Core.V4.5, Version=5.6.2022.5000, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Kivii.Core.5.6.2022.5000\lib\net45\Kivii.Core.V4.5.dll</HintPath> <HintPath>..\..\packages\Kivii.Core.5.6.2022.5000\lib\net45\Kivii.Core.V4.5.dll</HintPath>
</Reference> </Reference>
<Reference Include="Kivii.Linq.V4.5, Version=5.6.2022.5000, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Kivii.Linq.V4.5, Version=5.6.2022.5020, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Kivii.Linq.5.6.2022.5000\lib\net45\Kivii.Linq.V4.5.dll</HintPath> <HintPath>..\..\packages\Kivii.Linq.5.6.2022.5020\lib\net45\Kivii.Linq.V4.5.dll</HintPath>
</Reference> </Reference>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Core" /> <Reference Include="System.Core" />
......
...@@ -92,9 +92,11 @@ namespace Kivii.Finances.Transforms ...@@ -92,9 +92,11 @@ namespace Kivii.Finances.Transforms
var settlement = new Settlement(); var settlement = new Settlement();
settlement.PopulateWith(item); settlement.PopulateWith(item);
settlement.Kvid = settlementKvid; settlement.Kvid = settlementKvid;
if (settlement.OwnerKvid == Guid.Empty)
{
settlement.OwnerKvid = KiviiContext.CurrentMember.DepartmentKvid; settlement.OwnerKvid = KiviiContext.CurrentMember.DepartmentKvid;
settlement.OwnerName = KiviiContext.CurrentMember.DepartmentName; settlement.OwnerName = KiviiContext.CurrentMember.DepartmentName;
}
settlement.BizId = item.BizId; settlement.BizId = item.BizId;
settlement.BizKvid = item.BizKvid; settlement.BizKvid = item.BizKvid;
settlement.BizType = typeof(G).FullName; settlement.BizType = typeof(G).FullName;
......
...@@ -2,5 +2,5 @@ ...@@ -2,5 +2,5 @@
<packages> <packages>
<package id="Kivii.Common" version="5.6.2022.5001" targetFramework="net45" /> <package id="Kivii.Common" version="5.6.2022.5001" targetFramework="net45" />
<package id="Kivii.Core" version="5.6.2022.5000" targetFramework="net45" /> <package id="Kivii.Core" version="5.6.2022.5000" targetFramework="net45" />
<package id="Kivii.Linq" version="5.6.2022.5000" targetFramework="net45" /> <package id="Kivii.Linq" version="5.6.2022.5020" targetFramework="net45" />
</packages> </packages>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment