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 48624a6..9036b0a 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 @@ -52,15 +52,15 @@ public class ApprovalProcessController extends BaseController { queryWrapper.orderByDesc("create_time"); if (approvalProcess.getTimeType() != null) { if (approvalProcess.getTimeType() == 1) { - queryWrapper.ge("create_time", System.currentTimeMillis() - 3 * 24 * 60 * 60 * 1000); + queryWrapper.le("create_time", System.currentTimeMillis() - 3 * 24 * 60 * 60 * 1000); } else if (approvalProcess.getTimeType() == 2) { - queryWrapper.ge("create_time", System.currentTimeMillis() - 7 * 24 * 60 * 60 * 1000); + queryWrapper.le("create_time", System.currentTimeMillis() - 7 * 24 * 60 * 60 * 1000); } else if (approvalProcess.getTimeType() == 3) { - queryWrapper.ge("create_time", System.currentTimeMillis() - 30 * 24 * 60 * 60 * 1000); + queryWrapper.le("create_time", System.currentTimeMillis() - 30 * 24 * 60 * 60 * 1000); } } - if (approvalProcess.getSubmitterId() != null){ + if (approvalProcess.getSubmitterId() != null) { queryWrapper.eq("submitter_id", getLoginUser().getUserId()); } List list = approvalsProcessService.list(queryWrapper); @@ -216,9 +216,9 @@ public class ApprovalProcessController extends BaseController { .one(); one.setDestinationIdCn(byId.getBusinessTripDestination()); String togUserIds = one.getTogUserIds(); - if (togUserIds != null && !"".equals(togUserIds)){ + if (togUserIds != null && !"".equals(togUserIds)) { List userList = new ArrayList<>(); - if (togUserIds.contains(",")){ + if (togUserIds.contains(",")) { String[] split = togUserIds.split(","); for (String s : split) { s = s.trim(); // 移除首尾空格 @@ -228,7 +228,7 @@ public class ApprovalProcessController extends BaseController { } } one.setTogUserList(userList); - }else { + } else { SysUser user = sysUserService.selectUserById(Long.parseLong(togUserIds)); userList.add(user); one.setTogUserList(userList);