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

Compare commits

base: lijingtong:4e4aa7f95ac41787f31485c8b20f70eb3828597c
Branches Tags
lijingtong:master
...
compare: lijingtong:e5bc9c7dac117f7fdb60a3d6e48dc93d3eaf705f
Branches Tags
lijingtong:master

2 Commits
4e4aa7f95a ... e5bc9c7dac

Author SHA1 Message Date
hanrenchun e5bc9c7dac Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	gather-app/src/main/java/com/ruoyi/business/controller/ApprovalProcessController.java
 2025-06-10 00:29:30 +08:00
hanrenchun 5b7b821e8b 修改 2025-06-10 00:28:15 +08:00
1 changed files with 5 additions and 5 deletions
Show Stats 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) {
queryWrapper.eq("submitter_id", getLoginUser().getUserId());
} else {
queryWrapper.ne("submitter_id", getLoginUser().getUserId());
queryWrapper.eq("submitter_id", approvalProcess.getSubmitterId());
}
List<ApprovalProcess> list = approvalsProcessService.list(queryWrapper);
List<ApprovalProcess> newList = new ArrayList<>();
@ -88,7 +86,7 @@ public class ApprovalProcessController extends BaseController {
continue;
}
}
if (process.getMatterType() == 3) {
else if (process.getMatterType() == 3) {
List<gwglLog> 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<gwglLog> 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) {