Merge branch 'master' into docker_package

Merge branch 'dev'
协作组互助审核通过时不发分配通知
2022-12-12 17:20:27 +08:00 · 2022-12-12 17:20:21 +08:00 · 2022-12-12 17:20:13 +08:00
1 changed files with 1 additions and 0 deletions
--- a/renren-admin/src/main/java/io/renren/modules/activiti/service/ActTaskService.java
+++ b/renren-admin/src/main/java/io/renren/modules/activiti/service/ActTaskService.java
@ -526,6 +526,7 @@ public class ActTaskService extends BaseServiceImpl {
        Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
        if (StringUtils.isNotEmpty(task.getAssignee())
                && !task.getAssignee().equals(userId)) {
            taskService.setVariable(taskId, "autoApply", taskId); // 配置不发送审核人分配通知
            taskService.setAssignee(taskId, userId); //与原任务审核人员不一致时，换成实际通过的人
        }
        if (StringUtils.isNotEmpty(comment)) {
Author	SHA1	Message	Date
wangliwen	077237c285	Merge branch 'master' into docker_package	2022-12-12 17:20:27 +08:00
wangliwen	10d9f4428a	Merge branch 'dev'	2022-12-12 17:20:21 +08:00
wangliwen	e3184382fc	协作组互助审核通过时不发分配通知	2022-12-12 17:20:13 +08:00