Merge branch 'master' into docker_package

Merge branch 'dev'
...恢复
2022-12-12 17:06:37 +08:00 · 2022-12-12 17:06:30 +08:00 · 2022-12-12 17:06:21 +08:00
1 changed files with 4 additions and 4 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
@ -524,10 +524,10 @@ public class ActTaskService extends BaseServiceImpl {
    public void completeTask(String taskId, String comment) {
        String userId = SecurityUser.getUserId().toString();
        Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
-//        if (StringUtils.isNotEmpty(task.getAssignee())
-//                && !task.getAssignee().equals(userId)) {
-//            taskService.setAssignee(taskId, userId); //与原任务审核人员不一致时，换成实际通过的人
-//        }
+        if (StringUtils.isNotEmpty(task.getAssignee())
+                && !task.getAssignee().equals(userId)) {
+            taskService.setAssignee(taskId, userId); //与原任务审核人员不一致时，换成实际通过的人
+        }
        if (StringUtils.isNotEmpty(comment)) {
            taskService.addComment(taskId, task.getProcessInstanceId(), comment);
        }
Author	SHA1	Message	Date
wangliwen	819e0bc441	Merge branch 'master' into docker_package	2022-12-12 17:06:37 +08:00
wangliwen	5468ce701b	Merge branch 'dev'	2022-12-12 17:06:30 +08:00
wangliwen	5f2b55d975	...恢复	2022-12-12 17:06:21 +08:00