username@email.com
2025-10-10 0dd76c2492f1afbe335b50a8ffb76e4af94271df
CY_ECommercePlatform/CY.WebForm/Pages/common/CommonAjax.aspx.cs
@@ -1706,12 +1706,11 @@
            OA_WageManage m_OA_WageManage = bll_OA_WageManageBLL.GetModelByMemberId(staffId);
            DateTime? calculateTimeStart = (calculateTimeString.Replace("年", "-").Replace("月", "-") + "1").ToDateTime2();
            DateTime? calculateTimeEnd = calculateTimeStart.Value.AddMonths(1);
            //奖励和罚款
            Pagination pa = new Pagination();
            pa.PageSize = 500;
            pa.PageIndex = 1;
            List<OA_WageAwardPunish> m_OA_WageAwardPunishList = bll_OA_WageAwardPunishBLL.SelectModelPageByWage(pa, CurrentUser.MemberId, null, m_OA_Staff.Name, calculateTimeString).ToList();
            List<OA_WageAwardPunish> m_OA_WageAwardPunishList = bll_OA_WageAwardPunishBLL.SelectModelPageByWage(pa, CurrentUser.MemberId, null, m_OA_Staff.Name, calculateTimeString, calculateTimeString).ToList();
            if (m_OA_WageAwardPunishList != null && m_OA_WageAwardPunishList.Count == 1)
            {
                m_OA_WagesRecord.RewardMoney = m_OA_WageAwardPunishList[0].RewardMoney ?? 0;