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

feat:profile

This commit is contained in:
李京通 2025-06-08 15:38:27 +08:00
parent 633e797908
commit 947e8bf472
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -39,6 +39,7 @@ public class ApprovalProcessController extends BaseController {
public TableDataInfo list(ApprovalProcess approvalProcess) { public TableDataInfo list(ApprovalProcess approvalProcess) {
startPage(); startPage();
QueryWrapper<ApprovalProcess> queryWrapper = new QueryWrapper<>(approvalProcess); QueryWrapper<ApprovalProcess> queryWrapper = new QueryWrapper<>(approvalProcess);
queryWrapper.orderByDesc("create_time");
List<ApprovalProcess> list = approvalsProcessService.list(queryWrapper); List<ApprovalProcess> list = approvalsProcessService.list(queryWrapper);
for (ApprovalProcess process : list) { for (ApprovalProcess process : list) {
@ -111,6 +112,7 @@ public class ApprovalProcessController extends BaseController {
public TableDataInfo getByApprovalNo(@PathVariable String id) { public TableDataInfo getByApprovalNo(@PathVariable String id) {
List<ApprovalProcess> list = approvalsProcessService.lambdaQuery() List<ApprovalProcess> list = approvalsProcessService.lambdaQuery()
.like(ApprovalProcess::getApprovalNo, id) .like(ApprovalProcess::getApprovalNo, id)
.orderByDesc(ApprovalProcess::getCreateTime)
.list(); .list();
return getDataTable(list); return getDataTable(list);
} }
@ -122,6 +124,7 @@ public class ApprovalProcessController extends BaseController {
public TableDataInfo getByuserId(@PathVariable Long id) { public TableDataInfo getByuserId(@PathVariable Long id) {
List<ApprovalProcess> list = approvalsProcessService.lambdaQuery() List<ApprovalProcess> list = approvalsProcessService.lambdaQuery()
.eq(ApprovalProcess::getSubmitterId, id) .eq(ApprovalProcess::getSubmitterId, id)
.orderByDesc(ApprovalProcess::getCreateTime)
.list(); .list();
return getDataTable(list); return getDataTable(list);
} }
@ -131,6 +134,7 @@ public class ApprovalProcessController extends BaseController {
public AjaxResult getById(@PathVariable Long id) { public AjaxResult getById(@PathVariable Long id) {
List<ApprovalProcess> list = approvalsProcessService.lambdaQuery() List<ApprovalProcess> list = approvalsProcessService.lambdaQuery()
.eq(ApprovalProcess::getId, id) .eq(ApprovalProcess::getId, id)
.orderByDesc(ApprovalProcess::getCreateTime)
.list(); .list();
return AjaxResult.success(list); return AjaxResult.success(list);
} }

3
gather-app/src/main/java/com/ruoyi/business/controller/BusinessTripApprovalController.java
View File

@ -125,6 +125,9 @@ public class BusinessTripApprovalController extends BaseController {
public AjaxResult applyList() { public AjaxResult applyList() {
List<SysUser> sysUsers = sysUserService.selectList(); List<SysUser> sysUsers = sysUserService.selectList();
List<SysDept> sysDepts = sysDeptService.selectDeptList(new SysDept()); List<SysDept> sysDepts = sysDeptService.selectDeptList(new SysDept());
sysDepts = sysDepts.stream()
.filter(dept -> dept.getDeptId() != 131000) // 过滤掉id为131000的部门
.collect(Collectors.toList());
List<SysDept> depts = sysDeptService.buildDeptTree(sysDepts); List<SysDept> depts = sysDeptService.buildDeptTree(sysDepts);
Map<Long, List<SysUser>> deptUsersMap = new HashMap<>(); Map<Long, List<SysUser>> deptUsersMap = new HashMap<>();
for (SysUser user : sysUsers) { for (SysUser user : sysUsers) {