Merge branch 'master' of http://git.dayaedu.com/yonge/mec

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

@@ -42,7 +42,6 @@ import com.ym.mec.biz.dal.enums.OrderDetailTypeEnum;
 import com.ym.mec.biz.service.ContractService;
 import com.ym.mec.biz.service.GoodsService;
 import com.ym.mec.biz.service.MusicGroupService;
-import com.ym.mec.biz.service.MusicGroupSubjectGoodsGroupService;
 import com.ym.mec.biz.service.MusicGroupSubjectPlanService;
 import com.ym.mec.biz.service.StudentPaymentOrderService;
 import com.ym.mec.biz.service.StudentRegistrationService;

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

@@ -1,5 +1,14 @@
 package com.ym.mec.biz.service.impl;
 
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
 import com.ym.mec.biz.dal.dao.OrganizationDao;
 import com.ym.mec.biz.dal.dao.SchoolDao;
 import com.ym.mec.biz.dal.entity.School;
@@ -9,15 +18,6 @@ import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
 import com.ym.mec.util.collection.MapUtil;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
 
 @Service
 public class SchoolServiceImpl extends BaseServiceImpl<Integer, School>  implements SchoolService {

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

@@ -122,7 +122,7 @@
     <select id="queryByOrganId" resultMap="School">
         SELECT * FROM school
         <where>
-            del_flag_ != 1
+            del_flag_ != 1 and user_id_ is null
             <if test="organId != null">
                 AND FIND_IN_SET(organ_id_,#{organId})
             </if>
@@ -136,18 +136,6 @@
         select * from school where del_flag_ != 1 and user_id_ = #{userId}
     </select>
     <select id="findVipSchoolByUserId" resultMap="School">
-        SELECT
-            *
-        FROM
-            school
-        WHERE
-            del_flag_ != 1
-            AND organ_id_=#{organId}
-            <if test="isDefault == null">
-                AND ( user_id_ IS NULL OR user_id_ = #{userId} )
-            </if>
-            <if test="isDefault != null">
-                AND user_id_ = #{userId}
-            </if>
+        SELECT * FROM school WHERE del_flag_ != 1 AND (FIND_IN_SET(organ_id_,#{organId}) and user_id_ is NULL) or user_id_ = #{userId}
     </select>
 </mapper>

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

@@ -7,9 +7,12 @@ import com.ym.mec.biz.dal.entity.School;
 import com.ym.mec.biz.dal.entity.Teacher;
 import com.ym.mec.biz.service.SchoolService;
 import com.ym.mec.common.controller.BaseController;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+
+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;
@@ -72,6 +75,14 @@ public class TeacherSchoolController extends BaseController {
         if(sysUser == null){
             return failed(HttpStatus.FORBIDDEN,"请登录");
         }
-        return succeed(schoolService.findVipSchoolByTeacher(sysUser.getId(),sysUser.getOrganId(),isDefault));
+        Teacher teacher = teacherDao.get(sysUser.getId());
+        if(teacher == null){
+        	return failed("非法访问");
+		}
+		String organIdList = teacher.getOrganId();
+		if (StringUtils.isNoneBlank(teacher.getFlowOrganRange())) {
+			organIdList = organIdList + "," + teacher.getFlowOrganRange();
+		}
+        return succeed(schoolService.findVipSchoolByTeacher(sysUser.getId(),organIdList,isDefault));
     }
 }

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

@@ -115,10 +115,11 @@ public class SchoolController extends BaseController {
     @ApiOperation(value = "获取教师vip课教学点")
     @GetMapping("/findVipSchoolByTeacher")
     public Object findVipSchoolByTeacher(@ApiParam(value = "教师编号", required = true) Integer userId){
-        SysUser sysUser = sysUserFeignService.queryUserById(userId);
+    	SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null) {
             return failed("用户信息获取失败");
         }
-        return succeed(schoolService.findVipSchoolByTeacher(userId,sysUser.getOrganId(),null));
+        String organidList = sysUser.getOrganId();
+        return succeed(schoolService.findVipSchoolByTeacher(userId,organidList,null));
     }
 }