update

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

@@ -39,6 +39,7 @@ public interface SchoolDao extends BaseDAO<Integer, School> {
      * @return java.util.List<com.ym.mec.biz.dal.entity.School>
      */
     List<School> findVipSchoolByUserId(@Param("userId") Integer userId,
+                                       @Param("organId") String organId,
                                        @Param("isDefault") Integer isDefault);
 
 

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

@@ -15,6 +15,8 @@ public interface VipGroupDefaultClassesCycleDao extends BaseDAO<Integer, VipGrou
 
     int deleteAllByOrgan(Long organId);
 
+    int deleteAll();
+
     /**
      * @Author: Joburgess
      * @Date: 2019/10/8
@@ -31,6 +33,8 @@ public interface VipGroupDefaultClassesCycleDao extends BaseDAO<Integer, VipGrou
 
     List<VipGroupDefaultClassesCycle> findAllByOrgan(@Param("organId") Long organId);
 
+    List<VipGroupDefaultClassesCycle> findAllCycle();
+
     /**
      * @describe 根据乐团获取指定课次课排课范围
      * @author Joburgess

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

@@ -21,5 +21,5 @@ public interface SchoolService extends BaseService<Integer, School> {
      * @param teacherId:
      * @return java.util.List<com.ym.mec.biz.dal.entity.School>
      */
-    List<School> findVipSchoolByTeacher(Integer teacherId,Integer isDefault);
+    List<School> findVipSchoolByTeacher(Integer teacherId,String organId,Integer isDefault);
 }

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

@@ -1,14 +1,12 @@
 package com.ym.mec.biz.service.impl;
 
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
 import com.ym.mec.biz.dal.dao.SchoolDao;
 import com.ym.mec.biz.dal.entity.School;
-import com.ym.mec.biz.dal.enums.YesOrNoEnum;
 import com.ym.mec.biz.service.SchoolService;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
 import java.util.List;
 
@@ -29,7 +27,7 @@ public class SchoolServiceImpl extends BaseServiceImpl<Integer, School>  impleme
 	}
 
 	@Override
-	public List<School> findVipSchoolByTeacher(Integer teacherId,Integer isDefault) {
-		return schoolDao.findVipSchoolByUserId(teacherId,isDefault);
+	public List<School> findVipSchoolByTeacher(Integer teacherId,String organId,Integer isDefault) {
+		return schoolDao.findVipSchoolByUserId(teacherId,organId,isDefault);
 	}
 }

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

@@ -1,19 +1,18 @@
 package com.ym.mec.biz.service.impl;
 
-import java.util.Comparator;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
 import com.ym.mec.biz.dal.dao.VipGroupDefaultClassesCycleDao;
 import com.ym.mec.biz.dal.entity.VipGroupDefaultClassesCycle;
 import com.ym.mec.biz.service.VipGroupDefaultClassesCycleService;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Comparator;
+import java.util.List;
+import java.util.stream.Collectors;
 
 @Service
 public class VipGroupDefaultClassesCycleServiceImpl extends BaseServiceImpl<Integer, VipGroupDefaultClassesCycle>  implements VipGroupDefaultClassesCycleService {
@@ -37,10 +36,10 @@ public class VipGroupDefaultClassesCycleServiceImpl extends BaseServiceImpl<Inte
 			if(null!=checkMaxClassTimes){
 				throw new BizException("已存在包含该课次的设置!");
 			}
-			List<VipGroupDefaultClassesCycle> allRecord = vipGroupDefaultClassesCycleDao.findAllByOrgan(bean.getOrganId());
+			List<VipGroupDefaultClassesCycle> allRecord = vipGroupDefaultClassesCycleDao.findAllCycle();
 			allRecord.add(bean);
 			allRecord=createMinClassTimess(allRecord);
-			vipGroupDefaultClassesCycleDao.deleteAllByOrgan(bean.getOrganId());
+			vipGroupDefaultClassesCycleDao.deleteAll();
 			return vipGroupDefaultClassesCycleDao.batchInstert(allRecord);
 		}
 	}
@@ -52,24 +51,21 @@ public class VipGroupDefaultClassesCycleServiceImpl extends BaseServiceImpl<Inte
 
 	@Override
 	public int update(VipGroupDefaultClassesCycle bean) {
-		VipGroupDefaultClassesCycle vipGroupDefaultClassesCycle = vipGroupDefaultClassesCycleDao.get(bean.getId());
 		vipGroupDefaultClassesCycleDao.delete(bean.getId());
 		bean.setId(null);
-		bean.setOrganId(vipGroupDefaultClassesCycle.getOrganId());
 		return (int) insert(bean);
 	}
 
 	@Transactional(rollbackFor = Exception.class)
 	@Override
 	public int delete(Integer id) {
-		VipGroupDefaultClassesCycle bean=vipGroupDefaultClassesCycleDao.get(id);
 		super.delete(id);
-		List<VipGroupDefaultClassesCycle> allRecord = vipGroupDefaultClassesCycleDao.findAllByOrgan(bean.getOrganId());
+		List<VipGroupDefaultClassesCycle> allRecord = vipGroupDefaultClassesCycleDao.findAllCycle();
 		allRecord=createMinClassTimess(allRecord);
 		if (allRecord == null || allRecord.size() == 0) {
 			return 1;
 		}
-		vipGroupDefaultClassesCycleDao.deleteAllByOrgan(bean.getOrganId());
+		vipGroupDefaultClassesCycleDao.deleteAll();
 		return vipGroupDefaultClassesCycleDao.batchInstert(allRecord);
 	}
 
@@ -85,4 +81,4 @@ public class VipGroupDefaultClassesCycleServiceImpl extends BaseServiceImpl<Inte
 		}
 		return vipGroupDefaultClassesCycles;
 	}
-}
+}

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

@@ -136,6 +136,7 @@
             school
         WHERE
             del_flag_ != 1
+            AND organ_id_=#{organId}
             <if test="isDefault==null">
                 AND ( user_id_ IS NULL OR user_id_ = #{userId} )
             </if>

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

@@ -31,9 +31,8 @@
 
 	<select id="findAllByOrgan" resultMap="VipGroupCategory">
 		SELECT vgc.*,vgdcup.online_classes_unit_price_,vgdcup.offline_classes_unit_price_ FROM vip_group_category vgc
-		LEFT JOIN vip_group_default_classes_unit_price_ vgdcup ON vgc.id_=vgdcup.vip_group_category_id_
+		LEFT JOIN vip_group_default_classes_unit_price_ vgdcup ON vgc.id_=vgdcup.vip_group_category_id_ AND FIND_IN_SET(vgdcup.organ_id_,#{organId})
 		WHERE vgc.del_flag_!= 1
-		AND FIND_IN_SET(vgdcup.organ_id_,#{organId})
 		ORDER BY id_
 	</select>
 

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

@@ -77,6 +77,9 @@ create_time_ = #{createTime},
 	<delete id="deleteAllByOrgan" >
 		DELETE FROM vip_group_default_classes_cycle WHERE organ_id_=#{organId}
 	</delete>
+	<delete id="deleteAll" >
+		DELETE FROM vip_group_default_classes_cycle
+	</delete>
 	
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="VipGroupDefaultClassesCycle" parameterType="map">
@@ -128,6 +131,13 @@ create_time_ = #{createTime},
 		</if>
 		ORDER BY max_class_times_
 	</select>
+	<select id="findAllCycle" resultMap="VipGroupDefaultClassesCycle">
+		SELECT
+			*
+		FROM
+			vip_group_default_classes_cycle
+		ORDER BY max_class_times_
+	</select>
     <select id="findByOrganAndClassTimes" resultMap="VipGroupDefaultClassesCycle">
 		SELECT
 			*

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

@@ -66,6 +66,6 @@ public class TeacherSchoolController extends BaseController {
         if(sysUser == null){
             return failed(HttpStatus.FORBIDDEN,"请登录");
         }
-        return succeed(schoolService.findVipSchoolByTeacher(sysUser.getId(),isDefault));
+        return succeed(schoolService.findVipSchoolByTeacher(sysUser.getId(),sysUser.getOrganId(),isDefault));
     }
 }

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

@@ -8,11 +8,9 @@ import com.ym.mec.biz.dal.entity.School;
 import com.ym.mec.biz.dal.page.SchoolQueryInfo;
 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.security.access.prepost.PreAuthorize;
@@ -117,6 +115,24 @@ public class SchoolController extends BaseController {
     @ApiOperation(value = "获取教师vip课教学点")
     @GetMapping("/findVipSchoolByTeacher")
     public Object findVipSchoolByTeacher(@ApiParam(value = "教师编号", required = true) Integer userId){
-        return succeed(schoolService.findVipSchoolByTeacher(userId,null));
+        SysUser sysUser = sysUserFeignService.queryUserById(userId);
+        String organId = "";
+        if (sysUser == null) {
+            return failed("用户信息获取失败");
+        }
+        if(!sysUser.getIsSuperAdmin()){
+            Employee employee = employeeDao.get(sysUser.getId());
+            if (StringUtils.isEmpty(organId)) {
+                organId = employee.getOrganIdList();
+            }else if(StringUtils.isEmpty(employee.getOrganIdList())){
+                return failed("用户所在分部异常");
+            }else {
+                List<String> list = Arrays.asList(employee.getOrganIdList().split(","));
+                if(!list.containsAll(Arrays.asList(organId.split(",")))){
+                    return failed("非法请求");
+                }
+            }
+        }
+        return succeed(schoolService.findVipSchoolByTeacher(userId,organId,null));
     }
 }

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

@@ -1,10 +1,12 @@
 package com.ym.mec.web.controller;
 
+import com.ym.mec.auth.api.client.SysUserFeignService;
+import com.ym.mec.biz.dal.dao.EmployeeDao;
+import com.ym.mec.biz.dal.entity.VipGroupCategory;
+import com.ym.mec.biz.service.VipGroupCategoryService;
+import com.ym.mec.common.controller.BaseController;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-
-import java.util.Date;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -12,11 +14,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.ym.mec.auth.api.client.SysUserFeignService;
-import com.ym.mec.biz.dal.dao.EmployeeDao;
-import com.ym.mec.biz.dal.entity.VipGroupCategory;
-import com.ym.mec.biz.service.VipGroupCategoryService;
-import com.ym.mec.common.controller.BaseController;
+import java.util.Date;
 
 @Api(tags = "vip课类别")
 @RequestMapping("vipGroupCategory")
@@ -40,8 +38,8 @@ public class VipGroupCategoryController extends BaseController {
 	@ApiOperation("全查询")
 	@GetMapping(value = "/queryAll")
     @PreAuthorize("@pcs.hasPermissions('vipGroupCategory/queryAll')")
-	public Object queryAll() {
-		return succeed(vipGroupCategoryService.findAll(null));
+	public Object queryAll(String organId) {
+		return succeed(vipGroupCategoryService.findAllByOrgan(organId));
 	}
 
 	@ApiOperation("获取教师课酬")