From 359d1a642072a4f276d7e378f4472d773db5fc62 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Tue, 23 Jan 2024 14:22:53 +0800 Subject: [PATCH 1/3] =?UTF-8?q?update=20=E6=B3=95=E8=A7=84=E5=90=88?= =?UTF-8?q?=E8=A7=84=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B=20=E6=B3=95?= =?UTF-8?q?=E8=A7=84=E5=B7=A5=E7=A8=8B=E5=B8=88=E5=AE=A1=E6=89=B9=E9=80=9A?= =?UTF-8?q?=E8=BF=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../projectstandard/service/ProcessProjectStandardService.java | 1 + 1 file changed, 1 insertion(+) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardService.java index 8fd3f055..7acca0e5 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardService.java @@ -595,6 +595,7 @@ public class ProcessProjectStandardService extends ServiceImpl Date: Tue, 23 Jan 2024 14:27:25 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20onlyOffice=E6=8A=A5=E9=94=99?= =?UTF-8?q?=E8=B7=A8=E5=9F=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/jero/config/filter/cors/CorsFilter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/laws-base/laws-base-core/src/main/java/com/jero/config/filter/cors/CorsFilter.java b/laws-base/laws-base-core/src/main/java/com/jero/config/filter/cors/CorsFilter.java index 97f423f9..7c761391 100644 --- a/laws-base/laws-base-core/src/main/java/com/jero/config/filter/cors/CorsFilter.java +++ b/laws-base/laws-base-core/src/main/java/com/jero/config/filter/cors/CorsFilter.java @@ -64,7 +64,7 @@ public class CorsFilter implements Filter { String[] ieBrowserSignals = {"MSIE", "Trident"}; String userAgent = request.getHeader("User-Agent"); for (String signal : ieBrowserSignals) { - if (userAgent.contains(signal)){ + if (userAgent != null && userAgent.contains(signal)){ return true; } } From 2205f5d3ae54edda5cb9dca30f3e2b79583cf1cd Mon Sep 17 00:00:00 2001 From: lijiarao Date: Tue, 23 Jan 2024 14:32:08 +0800 Subject: [PATCH 3/3] =?UTF-8?q?update=2080940=20=E5=82=AC=E5=8A=9E--?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E8=AF=AD=E9=9C=80=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/jero/common/api/vo/ResultCommon.java | 5 +++++ .../com/jero/modules/activiti/service/ProcessAllService.java | 2 +- .../src/main/resources/i18n/messages.properties | 3 ++- .../src/main/resources/i18n/messages_en.properties | 3 ++- .../src/main/resources/i18n/messages_zh.properties | 3 ++- 5 files changed, 12 insertions(+), 4 deletions(-) diff --git a/laws-base/laws-base-core/src/main/java/com/jero/common/api/vo/ResultCommon.java b/laws-base/laws-base-core/src/main/java/com/jero/common/api/vo/ResultCommon.java index 95ee99ff..df9e9e52 100644 --- a/laws-base/laws-base-core/src/main/java/com/jero/common/api/vo/ResultCommon.java +++ b/laws-base/laws-base-core/src/main/java/com/jero/common/api/vo/ResultCommon.java @@ -121,6 +121,11 @@ public class ResultCommon { * 只能催办待办任务 */ public static final String TASK_URGING_ERROR = "task.urging.error"; + /** + * 暂无该流程催办权限 + */ + public static final String TASK_URGING_ERROR_2 = "task.urging.error.2"; + /** * 草稿不存在 diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessAllService.java b/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessAllService.java index e540c672..e46c21a1 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessAllService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessAllService.java @@ -266,7 +266,7 @@ public class ProcessAllService extends ServiceImpl .collect(Collectors.toList()); String loginUserId = CurrentUserUtil.getId(); if (!canUrgingUserList.contains(loginUserId)){ - throw new JeroBootException(ResultCommon.HORIZONTAL_TRANSGRESSION); + throw new JeroBootException(ResultCommon.TASK_URGING_ERROR_2); } //获得流程总表，发送消息 diff --git a/laws-single-startup/src/main/resources/i18n/messages.properties b/laws-single-startup/src/main/resources/i18n/messages.properties index 0e6ede99..35043f48 100644 --- a/laws-single-startup/src/main/resources/i18n/messages.properties +++ b/laws-single-startup/src/main/resources/i18n/messages.properties @@ -68,4 +68,5 @@ en.standard.number.conflict=\u4F01\u6807\u7F16\u53F7\u5DF2\u5B58\u5728\uFF0C\u97 tag.add.error.2=\u6BCF\u5F20\u8868\u6700\u591A\u670950\u4E2A\u5B57\u6BB5\u3002 task.urging.error=\u53EA\u80FD\u50AC\u529E\u5F85\u529E\u4EFB\u52A1 invalid.esp=\u65E0\u6548\u7684\u4F01\u6807\u8BA1\u5212\uFF0C\u8BF7\u91CD\u65B0\u9009\u62E9 -can.not.edit.abolish.or.archive.es=\u5DF2\u5E9F\u6B62\u6216\u5DF2\u5F52\u6863\u7684\u4F01\u6807\u8BA1\u5212\u4E0D\u80FD\u7F16\u8F91,\u8BF7\u91CD\u65B0\u9009\u62E9 \ No newline at end of file +can.not.edit.abolish.or.archive.es=\u5DF2\u5E9F\u6B62\u6216\u5DF2\u5F52\u6863\u7684\u4F01\u6807\u8BA1\u5212\u4E0D\u80FD\u7F16\u8F91,\u8BF7\u91CD\u65B0\u9009\u62E9 +task.urging.error.2=\u6682\u65E0\u8BE5\u6D41\u7A0B\u50AC\u529E\u6743\u9650 \ No newline at end of file diff --git a/laws-single-startup/src/main/resources/i18n/messages_en.properties b/laws-single-startup/src/main/resources/i18n/messages_en.properties index fa79f13e..8cc57651 100644 --- a/laws-single-startup/src/main/resources/i18n/messages_en.properties +++ b/laws-single-startup/src/main/resources/i18n/messages_en.properties @@ -73,4 +73,5 @@ en.standard.number.conflict=standard number exists tag.add.error.2=each table can have a maximum of 50 fields. task.urging.error=Can only remind to do tasks invalid.esp=Invalid enterprise standard, please check -can.not.edit.abolish.or.archive.es=Can not edit abolished or archived enterprise standards, please check \ No newline at end of file +can.not.edit.abolish.or.archive.es=Can not edit abolished or archived enterprise standards, please check +task.urging.error.2=I currently do not have the authority to urge this process \ No newline at end of file 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 a60a15cf..cbdcfc66 100644 --- a/laws-single-startup/src/main/resources/i18n/messages_zh.properties +++ b/laws-single-startup/src/main/resources/i18n/messages_zh.properties @@ -73,4 +73,5 @@ en.standard.number.conflict=\u4F01\u6807\u7F16\u53F7\u5DF2\u5B58\u5728\uFF0C\u97 tag.add.error.2=\u6BCF\u5F20\u8868\u6700\u591A\u670950\u4E2A\u5B57\u6BB5\u3002 task.urging.error=\u53EA\u80FD\u50AC\u529E\u5F85\u529E\u4EFB\u52A1 invalid.esp=\u65E0\u6548\u7684\u4F01\u6807\u8BA1\u5212\uFF0C\u8BF7\u91CD\u65B0\u9009\u62E9 -can.not.edit.abolish.or.archive.es=\u5DF2\u5E9F\u6B62\u6216\u5DF2\u5F52\u6863\u7684\u4F01\u6807\u8BA1\u5212\u4E0D\u80FD\u7F16\u8F91,\u8BF7\u91CD\u65B0\u9009\u62E9 \ No newline at end of file +can.not.edit.abolish.or.archive.es=\u5DF2\u5E9F\u6B62\u6216\u5DF2\u5F52\u6863\u7684\u4F01\u6807\u8BA1\u5212\u4E0D\u80FD\u7F16\u8F91,\u8BF7\u91CD\u65B0\u9009\u62E9 +task.urging.error.2=\u6682\u65E0\u8BE5\u6D41\u7A0B\u50AC\u529E\u6743\u9650 \ No newline at end of file