Merge remote-tracking branch 'origin/saas' into saas

mec-biz/src/main/java/com/ym/mec/biz/service/impl/DegreeRegistrationServiceImpl.java

@@ -1,10 +1,7 @@
 package com.ym.mec.biz.service.impl;
 
 import com.ym.mec.auth.api.entity.SysUser;
-import com.ym.mec.biz.dal.dao.DegreeRegistrationDao;
-import com.ym.mec.biz.dal.dao.StudentPaymentOrderDetailDao;
-import com.ym.mec.biz.dal.dao.StudentTeacherMapperDao;
-import com.ym.mec.biz.dal.dao.SysConfigDao;
+import com.ym.mec.biz.dal.dao.*;
 import com.ym.mec.biz.dal.dto.DegreeRegistrationActivityDto;
 import com.ym.mec.biz.dal.dto.DegreeRegistrationDto;
 import com.ym.mec.biz.dal.dto.PageInfoDegree;
@@ -61,6 +58,9 @@ public class DegreeRegistrationServiceImpl extends BaseServiceImpl<Integer, Degr
     private SubjectService subjectService;
 
     @Autowired
+    private SubjectDao subjectDao;
+
+    @Autowired
     private OrganizationService organizationService;
 
     @Override
@@ -280,7 +280,7 @@ public class DegreeRegistrationServiceImpl extends BaseServiceImpl<Integer, Degr
             // 设置声部
             Set<Integer> subjectIdSet = dataList.stream().map(o -> o.getSubjectId()).filter(Objects::nonNull).collect(Collectors.toSet());
 
-            List<Subject> subjectList = subjectService.findBySubjectByIdList(new ArrayList<>(subjectIdSet));
+            List<Subject> subjectList = subjectDao.findBySubjectIds(new ArrayList<>(subjectIdSet));
 
             // id 分组
             Map<Integer, Subject> subjectMap = subjectList.stream().collect(Collectors.toMap(Subject::getId, Function.identity()));

mec-web/src/main/java/com/ym/mec/web/controller/DegreeController.java

@@ -29,7 +29,7 @@ public class DegreeController extends BaseController { ;
     @GetMapping("/queryPage")
     @PreAuthorize("@pcs.hasPermissions('degree/queryPage')")
     public HttpResponseResult queryPage(DegreeQueryInfo queryInfo) {
-        queryInfo.setOrganId(organizationService.getEmployeeOrgan(queryInfo.getOrganId()));
+//        queryInfo.setOrganId(organizationService.getEmployeeOrgan(queryInfo.getOrganId()));
         queryInfo.setSort("create_time_");
         queryInfo.setOrder("DESC");
         return succeed(degreeRegistrationService.getPageList(queryInfo));