Merge remote-tracking branch 'origin/main'

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);