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-10-14 11:26:58 +08:00
parent 27b34d26c2 b1376f4646
commit a1fbce7737
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
renren-admin/src/main/java/io/renren/modules/activiti/controller/ActTaskController.java
View File

@ -9,6 +9,7 @@ import io.renren.common.utils.Result;
import io.renren.modules.activiti.dto.TaskDTO; import io.renren.modules.activiti.dto.TaskDTO;
import io.renren.modules.activiti.service.ActTaskService; import io.renren.modules.activiti.service.ActTaskService;
import io.renren.modules.security.user.SecurityUser; import io.renren.modules.security.user.SecurityUser;
import io.renren.modules.security.user.UserDetail;
import io.renren.modules.sys.dto.SysUserDTO; import io.renren.modules.sys.dto.SysUserDTO;
import io.renren.modules.sys.service.SysUserService; import io.renren.modules.sys.service.SysUserService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
@ -334,11 +335,14 @@ public class ActTaskController {
}) })
// @RequiresPermissions("sys:task:all") // @RequiresPermissions("sys:task:all")
public Result endProcess(String taskId, String instanceId, String comment) { public Result endProcess(String taskId, String instanceId, String comment) {
// final UserDetail user = SecurityUser.getUser(); final UserDetail user = SecurityUser.getUser();
if (!StringUtils.isEmpty(taskId)) { // 存在taskId if (!StringUtils.isEmpty(taskId)) { // 存在taskId
actTaskService.endProcess(taskId, comment); actTaskService.endProcess(taskId, comment);
} }
if (StringUtils.isEmpty(taskId) && !StringUtils.isEmpty(instanceId)) { // 通过实例id if (StringUtils.isEmpty(taskId) && !StringUtils.isEmpty(instanceId)) { // 通过实例id
if (org.apache.commons.lang3.StringUtils.isEmpty(comment)) {
comment = String.format("由发起人\"%s\"主动撤回", user.getRealName());
}
actTaskService.endProcessInstanceId(instanceId, comment); actTaskService.endProcessInstanceId(instanceId, comment);
} }
return new Result(); return new Result();