From 2d24a2cb2647d02a550286b3b137028a9f2d493c Mon Sep 17 00:00:00 2001
From: 18154758993 <605281283@qq.com>
Date: Thu, 16 Oct 2025 09:53:44 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2sql?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/stureg/SrsStuRegCountMapper.xml   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srs-stureg/src/main/resources/mapper/stureg/SrsStuRegCountMapper.xml b/srs-stureg/src/main/resources/mapper/stureg/SrsStuRegCountMapper.xml
index 364d691..5063119 100644
--- a/srs-stureg/src/main/resources/mapper/stureg/SrsStuRegCountMapper.xml
+++ b/srs-stureg/src/main/resources/mapper/stureg/SrsStuRegCountMapper.xml
@@ -238,7 +238,7 @@
                  select s.tools_type,case  when r.xy='经济管理学院' then '长堽校区'
                                            when  r.xy='信息工程学院' then '长堽校区' else '里建校区' end as xq
                  from srs_at_station s inner  join srs_stu_reg r on s.ksh=r.ksh where s.create_time>CURDATE()-INTERVAL 90 DAY ) t
-        group by tools_type,xq order by xq,totalnum desc
+        group by tools_type,xq order by xq,count(1) desc
     </select>
 
 

From f994fc391ee1b14248777b34cf11dd91fa69d3ed Mon Sep 17 00:00:00 2001
From: 18154758993 <605281283@qq.com>
Date: Sat, 18 Oct 2025 17:11:45 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=9B=BD=E5=8A=B1=E7=94=B3=E8=AF=B7?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/controller/comprehensive/KnzzGlApplyController.java | 4 ++--
 .../comprehensive/service/impl/KnzzGlApplyServiceImpl.java  | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/srs-admin/src/main/java/com/srs/web/controller/comprehensive/KnzzGlApplyController.java b/srs-admin/src/main/java/com/srs/web/controller/comprehensive/KnzzGlApplyController.java
index 79cbf66..544f092 100644
--- a/srs-admin/src/main/java/com/srs/web/controller/comprehensive/KnzzGlApplyController.java
+++ b/srs-admin/src/main/java/com/srs/web/controller/comprehensive/KnzzGlApplyController.java
@@ -202,7 +202,7 @@ public class KnzzGlApplyController extends BaseController {
     /**
      * 获取国家励志奖学金详细信息
      */
-    @PreAuthorize("@ss.hasPermi('comprehensive:knzzGlApply:query')")
+//    @PreAuthorize("@ss.hasPermi('comprehensive:knzzGlApply:query')")
     @GetMapping(value = "/{id}")
     @ApiOperation("获取国家励志奖学金详细信息")
     public AjaxResult getInfo(@PathVariable("id") Long id)
@@ -225,7 +225,7 @@ public class KnzzGlApplyController extends BaseController {
     /**
      * 修改国家励志奖学金
      */
-    @PreAuthorize("@ss.hasPermi('comprehensive:knzzGlApply:edit')")
+//    @PreAuthorize("@ss.hasPermi('comprehensive:knzzGlApply:edit')")
     @Log(title = "国家励志奖学金", businessType = BusinessType.UPDATE)
     @PostMapping("/update")
     @ApiOperation("修改国家励志奖学金")
diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/KnzzGlApplyServiceImpl.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/KnzzGlApplyServiceImpl.java
index 0988137..a4d2bf2 100644
--- a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/KnzzGlApplyServiceImpl.java
+++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/KnzzGlApplyServiceImpl.java
@@ -107,9 +107,9 @@ public class KnzzGlApplyServiceImpl extends ServiceImpl<KnzzGlApplyMapper,KnzzGl
                 throw new Exception("申请不存在");
             }
 
-            if(!Objects.equals(apply.getStuNo(), getUsername())){
-                throw new Exception("只能修改自己的申请");
-            }
+//            if(!Objects.equals(apply.getStuNo(), getUsername())){
+//                throw new Exception("只能修改自己的申请");
+//            }
 
             if(!Objects.equals(apply.getApplyStatus(), "1")){
                 throw new Exception("申请已处理");