From 48558f74d4c402d5bcad886ce30fc47ce2d32461 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Thu, 1 Feb 2024 14:09:35 +0800 Subject: [PATCH] =?UTF-8?q?fix=2080939=20=E6=B5=81=E7=A8=8B=E4=B8=AD?= =?UTF-8?q?=E5=BF=83-=E5=82=AC=E5=8A=9E=20=E5=8F=AA=E6=9C=89=E5=9C=A8?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E8=AF=A6=E6=83=85=E7=9A=84=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E5=A4=84=E7=90=86=E4=BA=BA=E4=B8=AD=E5=9B=9E=E6=98=BE=E7=9A=84?= =?UTF-8?q?=E4=BA=BA=E5=91=98=E5=8F=AF=E4=BB=A5=E5=82=AC=E5=8A=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jero/modules/activiti/service/ProcessAllService.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 41b71243..90a126e3 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 @@ -31,6 +31,7 @@ import com.jero.modules.activiti.process.esRevision.service.EsRevisionService; import com.jero.modules.activiti.util.SpringContextUtil; import com.jero.modules.activiti.vo.DelegateTaskParam; import com.jero.modules.activiti.vo.ResolveTaskParam; +import com.jero.modules.laws.common.constant.FieldCommon; import com.jero.modules.laws.common.constant.MessageTemplateCodeCommon; import com.jero.modules.laws.common.util.CurrentUserUtil; import com.jero.modules.laws.enterprise.entity.EnterpriseStandardPlan; @@ -284,7 +285,9 @@ public class ProcessAllService extends ServiceImpl .distinct() .collect(Collectors.toList()); String loginUserId = CurrentUserUtil.getId(); - if (!canUrgingUserList.contains(loginUserId)){ + String roleIds = CurrentUserUtil.getRoles(); + //管理员和当前流程中人员可以催办 + if (!roleIds.contains(FieldCommon.ROLE_ADMIN) && !canUrgingUserList.contains(loginUserId)){ throw new JeroBootException(ResultCommon.TASK_URGING_ERROR_2); }