大数据与最优化研究所 vor 1 Jahr
Ursprung
Commit
a6b86efff2

+ 7 - 6
src/main/java/com/xjrsoft/module/workflow/service/impl/WorkflowExecuteServiceImpl.java

@@ -1536,13 +1536,10 @@ public class WorkflowExecuteServiceImpl implements IWorkflowExecuteService {
 
     @Override
     public Page<PendingTaskVo> myExamine(Page<PendingTaskVo> page, MyExaminePageDto dto) {
-        //获取登录者信息
-        SaSession tokenSession = StpUtil.getTokenSession();
-        User user = tokenSession.get(GlobalConstant.LOGIN_USER_INFO_KEY, new User());
         List<String> taskIds = new ArrayList<>();
         List<WorkflowApproveRecord> list = approveRecordService.list(
                 new QueryWrapper<WorkflowApproveRecord>().lambda()
-                        .eq(WorkflowApproveRecord::getApproveUserId, user.getId())
+                        .eq(WorkflowApproveRecord::getApproveUserId, StpUtil.getLoginIdAsLong())
         );
         taskIds = list.stream().map(WorkflowApproveRecord::getTaskId).collect(Collectors.toList());
 //        if(dto.getStatus() != null && dto.getStatus() == 1){
@@ -1586,8 +1583,12 @@ public class WorkflowExecuteServiceImpl implements IWorkflowExecuteService {
 //            List<Task> tasks = taskQuery.orderByTaskCreateTime().desc().listPage(Convert.toInt((dto.getLimit() - 1) * dto.getSize()), dto.getSize());
 //            taskIds = tasks.stream().map(Task::getId).collect(Collectors.toList());
 //        }
-        dto.setTaskIds(taskIds);
-        return xjrWorkflowExtraMapper.myApproveRecord(page, dto);
+        if(!taskIds.isEmpty()){
+            dto.setTaskIds(taskIds);
+            return xjrWorkflowExtraMapper.myApproveRecord(page, dto);
+        }
+
+        return new Page<>();
     }