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

Merge branch 'master' into docker_package

This commit is contained in:
wangliwen 2022-11-30 18:31:22 +08:00
parent 6e71734a50 ecf908b5bf
commit 1669dc52ff
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
renren-admin/src/main/java/io/renren/modules/reminders/controller/TRemindersController.java
View File

@ -74,7 +74,7 @@ public class TRemindersController {
public Result save(@RequestBody TRemindersDTO dto) { public Result save(@RequestBody TRemindersDTO dto) {
UserDetail user = SecurityUser.getUser(); UserDetail user = SecurityUser.getUser();
SysUserDTO userDTO = sysUserService.get(user.getId()); SysUserDTO userDTO = sysUserService.get(user.getId());
dto.setRecipient(userDTO); dto.setSponsor(userDTO);
//效验数据 //效验数据
ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
tRemindersService.save(dto); tRemindersService.save(dto);

1
renren-admin/src/main/java/io/renren/modules/reminders/service/impl/TRemindersServiceImpl.java
View File

@ -83,6 +83,7 @@ public class TRemindersServiceImpl extends CrudServiceImpl<TRemindersDao, TRemin
dto.setProcessType(processInstanceDTO.getProcessVariables().getOrDefault("flowType", "未知流程").toString()); dto.setProcessType(processInstanceDTO.getProcessVariables().getOrDefault("flowType", "未知流程").toString());
} }
Task task = taskService.createTaskQuery().taskId(dto.getProcessTaskId().toString()).includeProcessVariables().singleResult(); Task task = taskService.createTaskQuery().taskId(dto.getProcessTaskId().toString()).includeProcessVariables().singleResult();
logger.info("该任务对应审核人：" + task.getAssignee());
if (StringUtils.isNumeric(task.getAssignee())) { // 对审核人发消息 if (StringUtils.isNumeric(task.getAssignee())) { // 对审核人发消息
Optional<SysUserDTO> assignee = Optional.ofNullable(sysUserService.get(Long.parseLong(task.getAssignee()))); // 获取审批人 Optional<SysUserDTO> assignee = Optional.ofNullable(sysUserService.get(Long.parseLong(task.getAssignee()))); // 获取审批人
dto.setRecipient(assignee.get()); dto.setRecipient(assignee.get());