wangliwen
/
share-platform
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'dev'

This commit is contained in:
wangliwen 2022-12-12 16:55:41 +08:00
parent 1a252a3cdb 4bdebca7d7
commit b8565cb9d1
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
renren-admin/src/main/java/io/renren/modules/activiti/service/ActTaskService.java
View File

@ -524,10 +524,10 @@ public class ActTaskService extends BaseServiceImpl {
public void completeTask(String taskId, String comment) { public void completeTask(String taskId, String comment) {
String userId = SecurityUser.getUserId().toString(); String userId = SecurityUser.getUserId().toString();
Task task = taskService.createTaskQuery().taskId(taskId).singleResult(); Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
if (StringUtils.isNotEmpty(task.getAssignee()) // if (StringUtils.isNotEmpty(task.getAssignee())
&& !task.getAssignee().equals(userId)) { // && !task.getAssignee().equals(userId)) {
taskService.setAssignee(taskId, userId); //与原任务审核人员不一致时，换成实际通过的人 // taskService.setAssignee(taskId, userId); //与原任务审核人员不一致时，换成实际通过的人
} // }
if (StringUtils.isNotEmpty(comment)) { if (StringUtils.isNotEmpty(comment)) {
taskService.addComment(taskId, task.getProcessInstanceId(), comment); taskService.addComment(taskId, task.getProcessInstanceId(), comment);
} }