diff --git a/gather-app/src/main/java/com/ruoyi/business/controller/ApprovalProcessController.java b/gather-app/src/main/java/com/ruoyi/business/controller/ApprovalProcessController.java index 535c67b..b1f5be6 100644 --- a/gather-app/src/main/java/com/ruoyi/business/controller/ApprovalProcessController.java +++ b/gather-app/src/main/java/com/ruoyi/business/controller/ApprovalProcessController.java @@ -61,9 +61,7 @@ public class ApprovalProcessController extends BaseController { } if (approvalProcess.getSubmitterId() != null) { - queryWrapper.eq("submitter_id", getLoginUser().getUserId()); - } else { - queryWrapper.ne("submitter_id", getLoginUser().getUserId()); + queryWrapper.eq("submitter_id", approvalProcess.getSubmitterId()); } List list = approvalsProcessService.list(queryWrapper); List newList = new ArrayList<>(); @@ -88,7 +86,7 @@ public class ApprovalProcessController extends BaseController { continue; } } - if (process.getMatterType() == 3) { + else if (process.getMatterType() == 3) { List list1 = gwglLogService.lambdaQuery() .eq(gwglLog::getApplyNo, process.getApprovalNo()) .orderByAsc(gwglLog::getCreateTime).list(); @@ -108,7 +106,7 @@ public class ApprovalProcessController extends BaseController { continue; } } - if (process.getMatterType() == 4) { + else if (process.getMatterType() == 4) { List list1 = gwglLogService.lambdaQuery() .eq(gwglLog::getApplyNo, process.getApprovalNo()) .orderByAsc(gwglLog::getCreateTime).list(); @@ -127,6 +125,8 @@ public class ApprovalProcessController extends BaseController { } else { continue; } + }else { + continue; } // 如果创建时间为当天的时间 if (process.getCreateTime() > System.currentTimeMillis() - 24 * 60 * 60 * 1000) {