费用审核

页面权限 查看，审核

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -918,13 +918,13 @@ namespace OASystem.API.Controllers
             if (_dto.DiId < 1) return Ok(JsonView(false, "团组Id为空"));
 
             PageFunAuthViewBase pageFunAuthView = new PageFunAuthViewBase();
+
             #region 页面操作权限验证
             pageFunAuthView = await GeneralMethod.PostUserPageFuncDatas(_dto.UserId,_dto.PageId);
 
             if (pageFunAuthView.CheckAuth == 0) return Ok(JsonView(false, "您没有查看权限"));
             #endregion
-
-
+            
             #endregion
 
             Grp_CreditCardPaymentView _view = new Grp_CreditCardPaymentView();
@@ -1148,19 +1148,41 @@ namespace OASystem.API.Controllers
             _view.TotalStr4 = string.Format(@"已审费用总额：{0}CNY&nbsp;|&nbsp;{1}USD&nbsp;|&nbsp;{2}EUR", YSFYCNY, YSFYUSD, YSFYEUR);
 
 
-            return Ok(JsonView(_view));
+            var _view1 = new
+            {
+                PageFuncAuth = pageFunAuthView,
+                Data = _view
+            };
+
+            return Ok(JsonView(_view1));
         }
 
 
         /// <summary>
+        /// 费用审核
         /// 修改团组费用审核状态
         /// </summary>
-        /// <param name="paras">参数Json字符串</param>
+        /// <param name="_dto">参数Json字符串</param>
         /// <returns></returns>
         [HttpPost]
         [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
         public async Task<IActionResult> PostAuditGrpCreditCardPayment(Edit_GrpCreditCardPaymentDto _dto)
         {
+            #region  参数验证
+            if (_dto.UserId < 1) return Ok(JsonView(false, "员工Id为空"));
+            if (_dto.PageId < 1) return Ok(JsonView(false, "页面Id为空"));
+            #endregion
+
+
+            #region 页面操作权限验证
+            PageFunAuthViewBase pageFunAuthView = new PageFunAuthViewBase();
+
+            pageFunAuthView = await GeneralMethod.PostUserPageFuncDatas(_dto.UserId, _dto.PageId);
+
+            if (pageFunAuthView.AuditAuth == 0) return Ok(JsonView(false, "您没有审核权限"));
+
+            #endregion
+
             List<string> idList = _dto.CreditIdStr.Split(',').ToList();
             Grp_CreditCardPayment _detail = _mapper.Map<Grp_CreditCardPayment>(_dto);
             DateTime dtNow = DateTime.Now;
@@ -1171,7 +1193,7 @@ namespace OASystem.API.Controllers
                 int CreditId = int.Parse(item);
                 var result = await _grpScheduleRep._sqlSugar.Updateable<Grp_CreditCardPayment>()
                 .SetColumns(it => it.IsAuditGM == _dto.AuditCode)
-                .SetColumns(it => it.AuditGMOperate == _dto.User)
+                .SetColumns(it => it.AuditGMOperate == _dto.UserId)
                 .SetColumns(it => it.AuditGMDate == dtNow.ToString())
                 .Where(s => s.Id == CreditId)
                 .ExecuteCommandAsync();

OASystem/OASystem.Domain/Dtos/Groups/GrpCreditCardPaymentDto.cs

@@ -47,10 +47,10 @@ namespace OASystem.Domain.Dtos.Groups
         public int AuditStatus { get; set; }
     }
 
-    public class Edit_GrpCreditCardPaymentDto
+    public class Edit_GrpCreditCardPaymentDto:UserPageFuncDtoBase
     {
         public string CreditIdStr { get; set; }
         public int AuditCode { get; set; }
-        public int User { get; set; }
+       
     }
 }