Merge branch 'zx_saas_2022_degree' of http://git.dayaedu.com/yonge/mec into master_saas

mec-web/src/main/java/com/ym/mec/web/controller/education/EduDegreeController.java

@@ -2,6 +2,7 @@ package com.ym.mec.web.controller.education;
 
 import com.ym.mec.biz.dal.page.DegreeQueryInfo;
 import com.ym.mec.biz.service.DegreeRegistrationService;
+import com.ym.mec.biz.service.OrganizationService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
 import io.swagger.annotations.Api;
@@ -18,11 +19,14 @@ public class EduDegreeController extends BaseController {
 
     @Autowired
     private DegreeRegistrationService degreeRegistrationService;
+    @Autowired
+    private OrganizationService organizationService;
 
 
     @ApiOperation(value = "查询收费列表")
     @GetMapping("/queryPage")
     public HttpResponseResult queryPage(DegreeQueryInfo queryInfo) {
+        queryInfo.setOrganId(organizationService.getEmployeeOrgan(queryInfo.getOrganId()));
         queryInfo.setSort("create_time_");
         queryInfo.setOrder("DESC");
         return succeed(degreeRegistrationService.getPageList(queryInfo));