update

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/VipGroupCategoryDao.java

@@ -10,7 +10,9 @@ import java.util.Set;
 
 public interface VipGroupCategoryDao extends BaseDAO<Integer, VipGroupCategory> {
 
-    List<VipGroupCategory> findAllByOrgan(@Param("organId") String organId, @Param("groupType") String groupType);
+    List<VipGroupCategory> findAllByOrgan1(@Param("organId") String organId, @Param("groupType") String groupType);
+
+    List<VipGroupCategory> findAllByOrgan(@Param("groupType") String groupType);
 
     List<VipGroupCategory> findTeacherDefaultSalary(Integer userId);
 

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

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

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

@@ -25,8 +25,13 @@ public class VipGroupCategoryServiceImpl extends BaseServiceImpl<Integer, VipGro
 	}
 
 	@Override
-	public List<VipGroupCategory> findAllByOrgan(String organId, String groupType) {
-		return vipGroupCategoryDao.findAllByOrgan(organId, groupType);
+	public List<VipGroupCategory> findAllByOrgan1(String organId, String groupType) {
+		return vipGroupCategoryDao.findAllByOrgan1(organId, groupType);
+	}
+
+	@Override
+	public List<VipGroupCategory> findAllByOrgan(String groupType) {
+		return vipGroupCategoryDao.findAllByOrgan(groupType);
 	}
 
 	@Override

mec-biz/src/main/resources/config/mybatis/VipGroupCategoryMapper.xml

@@ -32,14 +32,25 @@
 		ORDER BY id_
 	</select>
 
-	<select id="findAllByOrgan" resultMap="VipGroupCategory">
+	<select id="findAllByOrgan1" resultMap="VipGroupCategory">
 		SELECT
 		    vgc.*
 		    , vgdcup.online_classes_unit_price_
 		    , vgdcup.offline_classes_unit_price_
 			, vgdcup.id_ AS unit_price_id_
 		FROM vip_group_category vgc
-		LEFT JOIN vip_group_default_classes_unit_price_ vgdcup ON vgc.id_=vgdcup.vip_group_category_id_ <if test="organId != null"> AND FIND_IN_SET(vgdcup.organ_id_,#{organId})</if>
+		LEFT JOIN vip_group_default_classes_unit_price_ vgdcup ON vgc.id_ = vgdcup.vip_group_category_id_ <if test="organId != null"> AND FIND_IN_SET(vgdcup.organ_id_,#{organId})</if>
+		WHERE vgc.del_flag_ != 1
+		<if test="groupType != null">
+			AND vgc.group_type_ = #{groupType}
+		</if>
+		ORDER BY vgc.id_
+	</select>
+
+	<select id="findAllByOrgan" resultMap="VipGroupCategory">
+		SELECT
+		    vgc.*
+		FROM vip_group_category vgc
 		WHERE vgc.del_flag_ != 1
 		<if test="groupType != null">
 			AND vgc.group_type_ = #{groupType}

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

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