From ed479f0fe633226aa35847ec1e14870dd21d9442 Mon Sep 17 00:00:00 2001
From: zhy <17877871893@163.com>
Date: Sun, 14 Sep 2025 19:34:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=A6=E9=99=A2=E5=AF=BC=E5=87=BA=20?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../comprehensive/SrsCqScoreController.java         | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/srs-admin/src/main/java/com/srs/web/controller/comprehensive/SrsCqScoreController.java b/srs-admin/src/main/java/com/srs/web/controller/comprehensive/SrsCqScoreController.java
index bf24744..9f706b7 100644
--- a/srs-admin/src/main/java/com/srs/web/controller/comprehensive/SrsCqScoreController.java
+++ b/srs-admin/src/main/java/com/srs/web/controller/comprehensive/SrsCqScoreController.java
@@ -10,6 +10,8 @@ import com.srs.comprehensive.domain.SrsCqScore;
 import com.srs.comprehensive.domain.SrsMajors;
 import com.srs.comprehensive.domain.Vo.*;
 import com.srs.comprehensive.service.ISrsCqScoreService;
+import com.srs.system.domain.SysDeptMap;
+import com.srs.system.service.ISysDeptMapService;
 import com.srs.system.service.ISysPostService;
 import com.srs.web.controller.common.RoleBool;
 import io.swagger.annotations.Api;
@@ -92,13 +94,22 @@ public class SrsCqScoreController extends BaseController {
         }
     }
 
+    @Autowired
+    ISysDeptMapService _deptMap;
+
     @GetMapping("/xwExport")
     @ApiOperation(value = "学务导出成绩")
     public AjaxResult xwExport(CphExport param) {
         boolean hasRole = RoleBool.isXw(getUserId(), _postService);
         if (hasRole) {
+            Long oldId = getDeptId();
+            SysDeptMap dept = _deptMap.getOldDeptByNewId(oldId);
+            Long deptId = 0L;
+            if(dept != null){
+                deptId = dept.getOldDeptId();
+            }
             CphExport temp = new CphExport();
-            temp.setDeptId(getDeptId());
+            temp.setDeptId(deptId);
             temp.setGradeId(param.gradeId);
             temp.setClassId(param.classId);
             temp.setMajorId(param.majorId);