From 1b06963e5f9a1eea6b4a2e26b138c21a2f90786b Mon Sep 17 00:00:00 2001
From: pengwei <pengwei6411@163.com>
Date: Tue, 5 Aug 2025 11:05:02 +0800
Subject: [PATCH] =?UTF-8?q?fix:1=E3=80=81=E7=9D=A3=E5=AF=9F=E6=8A=A5?=
 =?UTF-8?q?=E5=91=8A=E8=8E=B7=E5=8F=96=E5=88=9B=E5=BB=BA=E4=BA=BA=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=20&=20=E6=A0=B9=E6=8D=AE=E5=88=9B=E5=BB=BA=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E6=8E=92=E5=BA=8F=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../biutag/supervision/service/SuperviseReportService.java   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/biutag/supervision/service/SuperviseReportService.java b/src/main/java/com/biutag/supervision/service/SuperviseReportService.java
index 615ef2c..ff6513d 100644
--- a/src/main/java/com/biutag/supervision/service/SuperviseReportService.java
+++ b/src/main/java/com/biutag/supervision/service/SuperviseReportService.java
@@ -58,7 +58,8 @@ public class SuperviseReportService extends ServiceImpl<SuperviseReportMapper, S
         //查询条件
         queryWrapper.like(StrUtil.isNotEmpty(queryParam.getReportName()),"t.report_name",queryParam.getReportName())
                 .like(StrUtil.isNotEmpty(queryParam.getCrtUser()),"t.crt_user",queryParam.getCrtUser())
-                .groupBy("t.id");
+                .groupBy("t.id").orderByDesc("t.crt_time");
+
 
         Page<SuperviseReportVo> page= baseMapper.queryPage(Page.of(queryParam.getCurrent(), queryParam.getSize()), queryWrapper);
         page.getRecords().forEach(s->{
@@ -90,7 +91,7 @@ public class SuperviseReportService extends ServiceImpl<SuperviseReportMapper, S
         UserAuth user = UserContextHolder.getCurrentUser();
 
         // 权限
-        if (!AppConstants.USER_TYPE_SUPER.equals(user.getUserType()) && !user.getRoleCodes().contains(RoleCodeEnum.FIRST_ADMIN.getCode())) {
+        if (!AppConstants.USER_TYPE_SUPER.equals(user.getUserType()) ) {
             report.setCrtDepart(user.getDepartName());
             report.setCrtDepartId(user.getDepartId());
             report.setCrtUser(user.getNickName());