1、冲突检测

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

@@ -10,7 +10,6 @@ import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.exception.BizException;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -49,15 +48,10 @@ public class VipGroupCategoryController extends BaseController {
 			return failed(HttpStatus.FORBIDDEN, "请登录");
 		}
 		Teacher teacher = teacherDao.get(user.getId());
-		String organId = teacher.getTeacherOrganId().toString();
 		if(teacher == null){
 			throw new BizException("教师信息异常");
-		}else {
-			if(StringUtils.isNotEmpty(teacher.getFlowOrganRange())){
-				organId += "," + teacher.getFlowOrganRange();
-			}
 		}
-		return succeed(vipGroupCategoryService.findAllByOrgan(user.getOrganId().toString()));
+		return succeed(vipGroupCategoryService.findAllByOrgan(teacher.getTeacherOrganId().toString()));
 	}
 
 	@ApiOperation("新增")