Browse Source

修复工资数据负数导入问题及我的工资查看

西昌分支
北京泉江 9 months ago
parent
commit
8e6efa4fce
2 changed files with 2 additions and 2 deletions
  1. +1
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Gz_Amounts/MyAmount.cshtml
  2. +1
    -1
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/Gz_Amounts/Gz_AmountsService.cs

+ 1
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Gz_Amounts/MyAmount.cshtml View File

@@ -240,7 +240,7 @@
return
}
this.detailData = []
let result = await this.NetRequest('/PersonnelManagement/Gz_Amounts/GetDetail', $.param({ userNo: this.multipleSelection[0].UserNo, year: this.multipleSelection[0].Year, month: this.multipleSelection[0].Month }), 'get')
let result = await this.NetRequest('/PersonnelManagement/Gz_Amounts/GetDetail', $.param({ userNo: this.multipleSelection[0].UserNo, year: this.multipleSelection[0].Year, month: this.multipleSelection[0].Month, cs: this.multipleSelection[0].SendCount }), 'get')
if (result) {
let obj = {}
this.trendsColumn = result.map((e, i) => {


+ 1
- 1
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/Gz_Amounts/Gz_AmountsService.cs View File

@@ -318,7 +318,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
}
if (!hlist.Any(x => x.Year == dbm.Year && x.Month == dbm.Month && x.UserNo == dbm.UserNo && x.SendCount == dbm.SendCount && x.ItemId == dbm.ItemId))
{
if ((cvb && amount > 0) || !cvb)
if ((cvb && amount != 0) || !cvb)
{
addEntity.Add(dbm);
}


Loading…
Cancel
Save