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

Compare commits

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

No commits in common. "77819056a569ed7020c0c2f589508db1597fbecd" and "5e89c0725d84fbc385e7e6e121854f57bd31f707" have entirely different histories.
77819056a5 ... 5e89c0725d

2 changed files with 7 additions and 14 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.getProcessTitles() != null) { if (approvalProcess.getProcessTitle() != null) {
queryWrapper.like("process_title", approvalProcess.getProcessTitles()) queryWrapper.like("process_title", approvalProcess.getProcessTitle())
.or().like("submitter_name", approvalProcess.getProcessTitles()); .or().like("submitter_name", approvalProcess.getProcessTitle());
} }
if (approvalProcess.getSubmitterId() != null) { if (approvalProcess.getSubmitterId() != null) {
@ -81,9 +81,6 @@ public class ApprovalProcessController extends BaseController {
process.setApprovalStatus(1); process.setApprovalStatus(1);
} }
} }
else {
continue;
}
}else { }else {
continue; continue;
} }
@ -102,8 +99,6 @@ public class ApprovalProcessController extends BaseController {
} else { } else {
process.setApprovalStatus(1); process.setApprovalStatus(1);
} }
}else {
continue;
} }
}else { }else {
continue; continue;
@ -123,8 +118,6 @@ public class ApprovalProcessController extends BaseController {
} else { } else {
process.setApprovalStatus(1); process.setApprovalStatus(1);
} }
}else {
continue;
} }
}else { }else {
continue; continue;
@ -219,9 +212,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.getProcessTitles() != null) { if (approvalProcess.getProcessTitle() != null) {
queryWrapper.like("process_title", approvalProcess.getProcessTitles()) queryWrapper.like("process_title", approvalProcess.getProcessTitle())
.or().like("submitter_name", approvalProcess.getProcessTitles()); .or().like("submitter_name", approvalProcess.getProcessTitle());
} }
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));
} }