待办任务

blade-service/blade-archive/src/main/java/org/springblade/archive/controller/ArchiveFileTaskController.java

@@ -311,8 +311,8 @@ public class ArchiveFileTaskController extends BladeController {
                     vo.setTaskReportUserName(nameMap.get(Long.parseLong(task.getReportUser())));
                     List<TaskParallel> taskParallelList = finalTaskParallelGroupMap.get(task.getProcessInstanceId());
                     if (taskParallelList != null && taskParallelList.size() > 0) {
-                        //如果是垂直签，判断是否是当前用户审批轮次，不是当前用户审批轮次就不显示该任务
-                        if (projectInfo != null && projectInfo.getApprovalType() == 1) {
+                        //如果是垂直签，且是待办页面，判断是否是当前用户审批轮次，不是当前用户审批轮次就不显示该任务
+                        if (projectInfo != null && projectInfo.getApprovalType() == 1 && dto.getSelectedType() == 1) {
                             boolean shouldDisplayTask = false; //标记是否显示当前任务
                             for (TaskParallel taskParallel : taskParallelList) {
                                 if (SecureUtil.getUserId().equals(Long.parseLong(taskParallel.getTaskUser()))) {

blade-service/blade-business/src/main/java/org/springblade/business/controller/TaskController.java

@@ -1342,8 +1342,8 @@ public class TaskController extends BladeController {
                     vo.setProcessInstanceId(task.getProcessInstanceId());
                     List<TaskParallel> taskParallelList = finalTaskParallelGroupMap.get(task.getProcessInstanceId());
                     if (taskParallelList != null && taskParallelList.size() > 0) {
-                        //如果是垂直签，判断是否是当前用户审批轮次，不是当前用户审批轮次就不显示该任务
-                        if (projectInfo != null && projectInfo.getApprovalType() == 1) {
+                        //如果是垂直签，且是待办页面，判断是否是当前用户审批轮次，不是当前用户审批轮次就不显示该任务
+                        if (projectInfo != null && projectInfo.getApprovalType() == 1 && dto.getSelectedType() == 1) {
                             boolean shouldDisplayTask = false; //标记是否显示当前任务
                             for (TaskParallel taskParallel : taskParallelList) {
                                 if (SecureUtil.getUserId().equals(Long.parseLong(taskParallel.getTaskUser()))) {
@@ -1603,7 +1603,7 @@ public class TaskController extends BladeController {
     @ApiOperation(value = "任务管理-一键重签", notes = "传入taskIds、下拉框的contractId、projectId")
     public R<Object> reSigningEVisa(@RequestParam String taskIds, @RequestParam String contractId, @RequestParam String projectId, HttpServletRequest request) {
         String header = request.getHeader("Blade-Auth");
-        taskService.reSigningEVisa(taskIds,contractId,projectId,header );
+        taskService.reSigningEVisa(taskIds, contractId, projectId, header);
         return R.success("任务已经成功提交重签，请耐心等待！");
     }