From 83f10c6a46cc8f497653146d563c060c3661707c Mon Sep 17 00:00:00 2001 From: yjz <3131811435@qq.com> Date: Sun, 4 Feb 2024 17:13:42 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E5=BE=81=E6=B1=82=E6=84=8F=E8=A7=81?= =?UTF-8?q?=E6=B5=81=E7=A8=8B):=2081750?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/laws/common/service/impl/LawsCommonServiceImpl.java | 2 +- .../src/main/resources/i18n/messages_zh.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java index 44461743..7b46bdb6 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java @@ -778,7 +778,7 @@ public class LawsCommonServiceImpl implements ILawsCommonService { // 标准状态 String standardState = (String) parameterMap.get(FieldCommon.STANDARD_STATE); // 报批 或 发布 - if (StrUtil.isNotBlank(standardState) && + if (StringUtils.isNotBlank(standardState) && (standardState.contains("3") || standardState.contains("4"))) { // 修改标准状态为发布或报批后，征求意见流程的超期待办，流程结束，不进入已办中 try { diff --git a/laws-single-startup/src/main/resources/i18n/messages_zh.properties b/laws-single-startup/src/main/resources/i18n/messages_zh.properties index 03dfdf3d..7181ea46 100644 --- a/laws-single-startup/src/main/resources/i18n/messages_zh.properties +++ b/laws-single-startup/src/main/resources/i18n/messages_zh.properties @@ -21,7 +21,7 @@ successfully.deleted.in.bulk=\u6279\u91CF\u5220\u9664\u6210\u529F cannot.duplicate.favorites=\u4E0D\u80FD\u91CD\u590D\u6536\u85CF please.select.data=\u8BF7\u9009\u62E9\u6570\u636E no.corresponding.data.found=\u672A\u627E\u5230\u5BF9\u5E94\u6570\u636E -over.due=\u5DF2\u8FC7\u671F\u4E0D\u80FD\u518D\u7EE7\u7EED\u64CD\u4F5C +over.due=\u8BE5\u5F81\u6C42\u610F\u89C1\u6D41\u7A0B\u5DF2\u7ED3\u675F,\u4E0D\u80FD\u529E\u7406 the.toplevel.group.cannot.be.deleted=\u6700\u9AD8\u7EA7\u7EC4\u522B\u4E0D\u80FD\u5220\u9664 please.select.personnel.and.workgroup=\u8BF7\u9009\u62E9\u4EBA\u5458\u548C\u5DE5\u4F5C\u7EC4 work.no.already.exists=\u5DE5\u53F7\u5DF2\u5B58\u5728