From 947e8bf4722d3e88891fd8eb51b1b608d980e197 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E4=BA=AC=E9=80=9A?= <2405957150@qq.com>
Date: Sun, 8 Jun 2025 15:38:27 +0800
Subject: [PATCH] feat:profile

---
 .../ruoyi/business/controller/ApprovalProcessController.java  | 4 ++++
 .../business/controller/BusinessTripApprovalController.java   | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/gather-app/src/main/java/com/ruoyi/business/controller/ApprovalProcessController.java b/gather-app/src/main/java/com/ruoyi/business/controller/ApprovalProcessController.java
index eb3b5a4..8bb492e 100644
--- a/gather-app/src/main/java/com/ruoyi/business/controller/ApprovalProcessController.java
+++ b/gather-app/src/main/java/com/ruoyi/business/controller/ApprovalProcessController.java
@@ -39,6 +39,7 @@ public class ApprovalProcessController extends BaseController {
     public TableDataInfo list(ApprovalProcess approvalProcess) {
         startPage();
         QueryWrapper<ApprovalProcess> queryWrapper = new QueryWrapper<>(approvalProcess);
+        queryWrapper.orderByDesc("create_time");
         List<ApprovalProcess> list = approvalsProcessService.list(queryWrapper);
 
         for (ApprovalProcess process : list) {
@@ -111,6 +112,7 @@ public class ApprovalProcessController extends BaseController {
     public TableDataInfo getByApprovalNo(@PathVariable String id) {
         List<ApprovalProcess> list = approvalsProcessService.lambdaQuery()
                 .like(ApprovalProcess::getApprovalNo, id)
+                .orderByDesc(ApprovalProcess::getCreateTime)
                 .list();
         return getDataTable(list);
     }
@@ -122,6 +124,7 @@ public class ApprovalProcessController extends BaseController {
     public TableDataInfo getByuserId(@PathVariable Long id) {
         List<ApprovalProcess> list = approvalsProcessService.lambdaQuery()
                 .eq(ApprovalProcess::getSubmitterId, id)
+                .orderByDesc(ApprovalProcess::getCreateTime)
                 .list();
         return getDataTable(list);
     }
@@ -131,6 +134,7 @@ public class ApprovalProcessController extends BaseController {
     public AjaxResult getById(@PathVariable Long id) {
         List<ApprovalProcess> list = approvalsProcessService.lambdaQuery()
                 .eq(ApprovalProcess::getId, id)
+                .orderByDesc(ApprovalProcess::getCreateTime)
                 .list();
         return AjaxResult.success(list);
     }
diff --git a/gather-app/src/main/java/com/ruoyi/business/controller/BusinessTripApprovalController.java b/gather-app/src/main/java/com/ruoyi/business/controller/BusinessTripApprovalController.java
index 4f5d7cf..883371d 100644
--- a/gather-app/src/main/java/com/ruoyi/business/controller/BusinessTripApprovalController.java
+++ b/gather-app/src/main/java/com/ruoyi/business/controller/BusinessTripApprovalController.java
@@ -125,6 +125,9 @@ public class BusinessTripApprovalController extends BaseController {
     public AjaxResult applyList() {
         List<SysUser> sysUsers = sysUserService.selectList();
         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);
         Map<Long, List<SysUser>> deptUsersMap = new HashMap<>();
         for (SysUser user : sysUsers) {