ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix 定时任务触发的任务，没有loginUser

Browse Source
This commit is contained in:
lijiarao
2024-05-09 09:32:34 +08:00
parent cec535c623
commit cdf5816315
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/impl/HiworkTodoServiceImpl.java
+13 -13
View File
@@ -170,7 +170,7 @@ public class HiworkTodoServiceImpl implements PushWorkflowIntegrationAPI {
} }
HiworkTodo hiworkTodo = new HiworkTodo(); HiworkTodo hiworkTodo = new HiworkTodo();
hiworkTodo.setSysCode(hiworkSysCode); hiworkTodo.setSysCode(hiworkSysCode);
LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
String date = DateUtil.formatDateTime(new Date()); String date = DateUtil.formatDateTime(new Date());
hiworkTodo.setFlowid(processApprovalRecord.getProcessInstanceId()); hiworkTodo.setFlowid(processApprovalRecord.getProcessInstanceId());
@@ -192,19 +192,22 @@ public class HiworkTodoServiceImpl implements PushWorkflowIntegrationAPI {
// 是否显示（0否，1是） // 是否显示（0否，1是）
hiworkTodo.setIsShow(String.valueOf(processNode.getIsView())); hiworkTodo.setIsShow(String.valueOf(processNode.getIsView()));
} }
String noticeTitle = processApprovalRecord.getTaskName() + "(" + loginUser.getRealname() + " " + date + ")"; String userId = processApprovalRecord.getUserId();
SysUser sysUser = sysUserService.getById(userId);
String noticeTitle = processApprovalRecord.getTaskName() + "(" + sysUser.getRealname() + " " + date + ")";
LambdaQueryWrapper<ProcessAll> queryProcessAll = new LambdaQueryWrapper<>(); LambdaQueryWrapper<ProcessAll> queryProcessAll = new LambdaQueryWrapper<>();
queryProcessAll.eq(ProcessAll::getProcessInstanceId,processApprovalRecord.getProcessInstanceId()); queryProcessAll.eq(ProcessAll::getProcessInstanceId,processApprovalRecord.getProcessInstanceId());
ProcessAll processAll = processAllService.getOne(queryProcessAll); ProcessAll processAll = processAllService.getOne(queryProcessAll);
if(!Objects.isNull(processAll)){ if(!Objects.isNull(processAll)){
String processName = ProcessTypeEnum.getNameByValue(processAll.getPrcType()); String processName = ProcessTypeEnum.getNameByValue(processAll.getPrcType());
noticeTitle = processName + "(" + loginUser.getRealname() + " " + date + ")"; noticeTitle = processName + "(" + sysUser.getRealname() + " " + date + ")";
hiworkTodo.setProcessName(processName); hiworkTodo.setProcessName(processName);
SysUser sysUser = sysUserService.getById(processAll.getCreateUserId()); SysUser createUser = sysUserService.getById(processAll.getCreateUserId());
if(!Objects.isNull(sysUser)){ if(!Objects.isNull(createUser)){
hiworkTodo.setCreateUserCode(sysUser.getUsername()); hiworkTodo.setCreateUserCode(createUser.getUsername());
hiworkTodo.setCreateUserName(sysUser.getRealname()); hiworkTodo.setCreateUserName(createUser.getRealname());
} }
if(!Objects.isNull(processAll.getDueTime())){ if(!Objects.isNull(processAll.getDueTime())){
hiworkTodo.setDueTime(processAll.getDueTime().getTime()); hiworkTodo.setDueTime(processAll.getDueTime().getTime());
@@ -238,12 +241,9 @@ public class HiworkTodoServiceImpl implements PushWorkflowIntegrationAPI {
hiworkTodo.setAppBusinessLink(appBusinessLink); hiworkTodo.setAppBusinessLink(appBusinessLink);
} }
hiworkTodo.setNoticeTitle(noticeTitle); hiworkTodo.setNoticeTitle(noticeTitle);
SysUser sysUser = sysUserService.getById(processApprovalRecord.getUserId()); hiworkTodo.setUserId(userId);
if(!Objects.isNull(sysUser)){ hiworkTodo.setUserCode(sysUser.getUsername());
hiworkTodo.setUserId(processApprovalRecord.getUserId()); hiworkTodo.setUserName(sysUser.getRealname());
hiworkTodo.setUserCode(sysUser.getUsername());
hiworkTodo.setUserName(sysUser.getRealname());
}
hiworkTodo.setReceiveTime(Instant.now()); hiworkTodo.setReceiveTime(Instant.now());
//2已完成时进入下一节点 //2已完成时进入下一节点
Integer finishFlag = processApprovalRecord.getFinishFlag(); Integer finishFlag = processApprovalRecord.getFinishFlag();