lijingtong
/
PublicAffairs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
李京通 2025-06-10 00:30:17 +08:00
parent d4a3d1097b e5bc9c7dac
commit 51112f346e
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gather-app/src/main/java/com/ruoyi/business/controller/ApprovalProcessController.java
View File

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