From f0226fac55f50b362d145ce969e66d41606a8b06 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 30 七月 2021 14:13:16 +0800
Subject: [PATCH] 今日开发 订单优惠 下订单的时候计算优惠 访问申请
---
zhengcaioa/zhengcaioa/Controllers/HR/SalaryCheckController.cs | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/zhengcaioa/zhengcaioa/Controllers/HR/SalaryCheckController.cs b/zhengcaioa/zhengcaioa/Controllers/HR/SalaryCheckController.cs
index 12c1eea..0f7e907 100644
--- a/zhengcaioa/zhengcaioa/Controllers/HR/SalaryCheckController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/HR/SalaryCheckController.cs
@@ -188,7 +188,7 @@
else
{
dangqianbuzhou = wfRunProcessDTO.Step;
- //鏌ヨ鍘嗗彶鎰忚
+ //鏌ヨ瀹℃壒杩涘害
lishiyijian = _wfHistoryService.GetListshenpi(wfRunProcessDTO.Id);
if (wfRunProcessDTO.Step != "鎻愪氦")
{
@@ -240,12 +240,20 @@
data.shenpi_status = "D";
data.status = "A";
resultEntity = _hrSalaryService.CheckAppea(data);
+ if (!resultEntity.Result)
+ {
+ return new JsonResult(resultEntity);
+ }
}
//鍙戣捣娴佺▼鐩稿叧
resultEntity = _wfRunProcessService.WfSalaryAppeal(data.id, data.Step, data.Tongguojujue, curentuser.Id, data.Content, data.tittle, "v1");
+ if (!resultEntity.Result)
+ {
+ return new JsonResult(resultEntity);
+ }
scope.Complete();
}
return new JsonResult(resultEntity);
--
Gitblit v1.9.1