update

mec-biz/src/main/java/com/ym/mec/biz/service/VipGroupCategoryService.java

@@ -8,9 +8,7 @@ import java.util.List;
 
 public interface VipGroupCategoryService extends BaseService<Integer, VipGroupCategory> {
 
-    List<VipGroupCategory> findAllByOrgan1(String organId, String groupType);
-
-    List<VipGroupCategory> findAllByOrgan(String groupType);
+    List<VipGroupCategory> findAllByOrgan(String organId, String groupType);
 
     List<VipGroupCategory> findTeacherSalary(Integer userId);
 

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

@@ -2,11 +2,13 @@ package com.ym.mec.biz.service.impl;
 
 import com.ym.mec.biz.dal.dao.VipGroupCategoryDao;
 import com.ym.mec.biz.dal.dto.ConditionDto;
+import com.ym.mec.biz.dal.entity.CourseSchedule;
 import com.ym.mec.biz.dal.entity.VipGroupCategory;
 import com.ym.mec.biz.service.VipGroupCategoryService;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
+import com.ym.mec.common.tenant.TenantContextHolder;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -25,14 +27,12 @@ public class VipGroupCategoryServiceImpl extends BaseServiceImpl<Integer, VipGro
 	}
 
 	@Override
-	public List<VipGroupCategory> findAllByOrgan1(String organId, String groupType) {
-
-		return vipGroupCategoryDao.findAllByOrgan1(organId, groupType);
-	}
-
-	@Override
-	public List<VipGroupCategory> findAllByOrgan(String groupType) {
-		return vipGroupCategoryDao.findAllByOrgan(groupType);
+	public List<VipGroupCategory> findAllByOrgan(String organId, String groupType) {
+		if (CourseSchedule.CourseScheduleType.LIVE.getCode().equals(groupType)) {
+			return vipGroupCategoryDao.findAllByOrgan1(organId, groupType);
+		}else {
+			return vipGroupCategoryDao.findAllByOrgan(groupType);
+		}
 	}
 
 	@Override

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

@@ -49,15 +49,12 @@ public class VipGroupCategoryController extends BaseController {
 	})
 	@GetMapping(value = "/queryAll")
     @PreAuthorize("@pcs.hasPermissions('vipGroupCategory/queryAll')")
-	public Object queryAll(@RequestParam(defaultValue = "VIP") String groupType) {
-
+	public Object queryAll(String organId,@RequestParam(defaultValue = "VIP") String groupType) {
 		// 直播课强制转换为
 		if (CourseSchedule.CourseScheduleType.LIVE.getCode().equals(groupType)) {
-			String organId = String.valueOf(TenantContextHolder.getTenantId());
-			return succeed(vipGroupCategoryService.findAllByOrgan1(organId, groupType));
-		}else {
-			return succeed(vipGroupCategoryService.findAllByOrgan(groupType));
+			organId = String.valueOf(TenantContextHolder.getTenantId());
 		}
+		return succeed(vipGroupCategoryService.findAllByOrgan(organId, groupType));
 	}
 
 	@ApiOperation("获取教师课酬")