From 33131eb89100f3d003ae61fe9a30c104e6780da3 Mon Sep 17 00:00:00 2001 From: hongguangwu <3004403350@qq.com> Date: Mon, 31 Mar 2025 16:38:32 +0800 Subject: [PATCH] =?UTF-8?q?MVP1.7.9-=E9=9D=9E=E5=B7=A5=E8=B5=84=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=EF=BC=8C=E6=94=BE=E5=BC=80=E5=95=86=E9=99=A9=E8=B4=AD?= =?UTF-8?q?=E4=B9=B0=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../salary/controller/TSalaryStandardController.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/controller/TSalaryStandardController.java b/yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/controller/TSalaryStandardController.java index f3e0fcef4..35aa57ade 100644 --- a/yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/controller/TSalaryStandardController.java +++ b/yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/controller/TSalaryStandardController.java @@ -197,6 +197,12 @@ public class TSalaryStandardController { if (Common.isNotNull(s.getIsCheckRisk()) && CommonConstants.ONE_INT == s.getIsCheckRisk()) { return R.ok(); } + if (!CommonConstants.ZERO_STRING.equals(s.getFormType())) { + s.setIsCheckRisk(CommonConstants.ONE_INT); + s.setCheckRiskRemark("éžå·¥èµ„类型,放开é™åˆ¶"); + this.updateById(s); + return R.ok(); + } YifuUser user = SecurityUtils.getUser(); if (user != null) { // 2025-1-14 10:59:37 æ交å‰æ‹¦æˆªï¼š @@ -225,7 +231,8 @@ public class TSalaryStandardController { || s.getStatus() == SalaryConstants.STATUS[5] || s.getStatus() == SalaryConstants.STATUS[6] || s.getStatus() == SalaryConstants.STATUS[7]) { - if (Common.isEmpty(s.getIsCheckRisk()) || CommonConstants.ZERO_INT == s.getIsCheckRisk()) { + if (CommonConstants.ZERO_STRING.equals(s.getFormType()) + && (Common.isEmpty(s.getIsCheckRisk()) || CommonConstants.ZERO_INT == s.getIsCheckRisk())) { return R.failed("è¯·å…ˆæ ¡éªŒå•†é™©ä¿¡æ¯ï¼"); } -- 2.18.1