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

Compare commits

base: lijingtong:5e89c0725d84fbc385e7e6e121854f57bd31f707
Branches Tags
lijingtong:master
..
compare: lijingtong:77819056a569ed7020c0c2f589508db1597fbecd
Branches Tags
lijingtong:master

2 Commits
5e89c0725d ... 77819056a5

Author SHA1 Message Date
hanrenchun 77819056a5 Merge remote-tracking branch 'origin/master' 2025-06-09 23:41:46 +08:00
hanrenchun d521574abc 修改 2025-06-09 23:41:38 +08:00
2 changed files with 14 additions and 7 deletions
Show Stats Expand all files Collapse all files

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

@ -55,9 +55,9 @@ public class ApprovalProcessController extends BaseController {
} }
} }
if (approvalProcess.getProcessTitle() != null) { if (approvalProcess.getProcessTitles() != null) {
queryWrapper.like("process_title", approvalProcess.getProcessTitle()) queryWrapper.like("process_title", approvalProcess.getProcessTitles())
.or().like("submitter_name", approvalProcess.getProcessTitle()); .or().like("submitter_name", approvalProcess.getProcessTitles());
} }
if (approvalProcess.getSubmitterId() != null) { if (approvalProcess.getSubmitterId() != null) {
@ -81,6 +81,9 @@ public class ApprovalProcessController extends BaseController {
process.setApprovalStatus(1); process.setApprovalStatus(1);
} }
} }
else {
continue;
}
}else { }else {
continue; continue;
} }
@ -99,6 +102,8 @@ public class ApprovalProcessController extends BaseController {
} else { } else {
process.setApprovalStatus(1); process.setApprovalStatus(1);
} }
}else {
continue;
} }
}else { }else {
continue; continue;
@ -118,6 +123,8 @@ public class ApprovalProcessController extends BaseController {
} else { } else {
process.setApprovalStatus(1); process.setApprovalStatus(1);
} }
}else {
continue;
} }
}else { }else {
continue; continue;
@ -212,9 +219,9 @@ public class ApprovalProcessController extends BaseController {
queryWrapper.ge("create_time", System.currentTimeMillis() - 30 * 24 * 60 * 60 * 1000L); queryWrapper.ge("create_time", System.currentTimeMillis() - 30 * 24 * 60 * 60 * 1000L);
} }
} }
if (approvalProcess.getProcessTitle() != null) { if (approvalProcess.getProcessTitles() != null) {
queryWrapper.like("process_title", approvalProcess.getProcessTitle()) queryWrapper.like("process_title", approvalProcess.getProcessTitles())
.or().like("submitter_name", approvalProcess.getProcessTitle()); .or().like("submitter_name", approvalProcess.getProcessTitles());
} }
queryWrapper.eq("submitter_id", getLoginUser().getUserId()); queryWrapper.eq("submitter_id", getLoginUser().getUserId());
List<ApprovalProcess> list = approvalsProcessService.list(queryWrapper); List<ApprovalProcess> list = approvalsProcessService.list(queryWrapper);

2
gather-app/src/main/java/com/ruoyi/business/controller/gwglLogController.java
View File

@ -31,7 +31,7 @@ public class gwglLogController extends BaseController {
public TableDataInfo query(@RequestBody gwglLog gwglLog){ public TableDataInfo query(@RequestBody gwglLog gwglLog){
startPage(); startPage();
QueryWrapper<gwglLog> queryWrapper = new QueryWrapper<>(gwglLog); QueryWrapper<gwglLog> queryWrapper = new QueryWrapper<>(gwglLog);
queryWrapper.orderByDesc("create_time"); // queryWrapper.orderByDesc("create_time");
return getDataTable(gwglLogService.list(queryWrapper)); return getDataTable(gwglLogService.list(queryWrapper));
} }