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); }