Merge branch 'saas' of http://git.dayaedu.com/yonge/mec into 2022DoubleEleven

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

@@ -77,6 +77,9 @@ public class CooperationShareProfitServiceImpl extends BaseServiceImpl<Integer,
 		}
 		List<CourseSchedule> courseSchedules = courseScheduleDao.findByCourseScheduleIds(courseIds);
 		List<String> musicGroupIds = courseSchedules.stream().map(e -> e.getMusicGroupId()).distinct().collect(Collectors.toList());
+		if(CollectionUtils.isEmpty(musicGroupIds)){
+			return;
+		}
 		musicGroupIds.removeAll(cooperationShareProfitDao.queryNotShare(musicGroupIds));
 		musicGroupIds.removeAll(Collections.singleton(null));
 		if(CollectionUtils.isEmpty(musicGroupIds)){

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

@@ -4,6 +4,7 @@ import com.ym.mec.biz.dal.entity.CooperationShareProfit;
 import com.ym.mec.biz.dal.entity.CooperationShareProfitDto;
 import com.ym.mec.biz.dal.page.CooperationShareProfitQueryInfo;
 import com.ym.mec.biz.service.CooperationShareProfitService;
+import com.ym.mec.biz.service.OrganizationService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
 import com.ym.mec.common.page.PageInfo;
@@ -23,11 +24,14 @@ public class CooperationShareProfitController extends BaseController {
 
     @Autowired
     private CooperationShareProfitService cooperationShareProfitService;
+    @Autowired
+    private OrganizationService organizationService;
 
     @ApiOperation(value = "获取合作单位分润列表")
     @PostMapping("/queryPage")
     @PreAuthorize("@pcs.hasPermissions('cooperationShareProfit/queryPage')")
     public HttpResponseResult<PageInfo<CooperationShareProfitDto>> queryPage(@RequestBody CooperationShareProfitQueryInfo queryInfo) throws Exception {
+        queryInfo.setOrganId(organizationService.getEmployeeOrgan(queryInfo.getOrganId()));
         return succeed(cooperationShareProfitService.queryDtoPage(queryInfo));
     }