update

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

@@ -67,7 +67,7 @@ public interface TeacherAttendanceDao extends BaseDAO<Long, TeacherAttendance> {
      * @param minutes 分钟数
      * @return
      */
-    List<Mapper> queryNoSignOutListByOverMinutes(Integer minutes);
+    List<Mapper> queryNoSignOutListByOverMinutes(@Param("minutes") Integer minutes,@Param("tenantId") Integer tenantId);
 
     /**
      * @describe 根据日期获取部门下异常签到的课程记录

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

@@ -13,13 +13,6 @@ import java.util.Map;
 public interface TeacherCourseRewardDao extends BaseDAO<Long, TeacherCourseReward> {
 
     /**
-     * 根据结算状态获取列表
-     * @param settlementStatus
-     * @return
-     */
-    List<TeacherCourseReward> findBySettlementStatus(@Param("settlementStatus") int settlementStatus);
-
-    /**
      * 批量修改
      * @param teacherCourseRewards
      */
@@ -67,6 +60,6 @@ public interface TeacherCourseRewardDao extends BaseDAO<Long, TeacherCourseRewar
      */
     int updateTeacherRewardConfirmStatusWithMonth(@Param("month") String month,
                                                   @Param("teacherId") Integer teacherId,
-                                                  @Param("confirmStatus")TeacherSalaryConfirmStatus confirmStatus);
+                                                  @Param("confirmStatus")TeacherSalaryConfirmStatus confirmStatus, @Param("tenantId") Integer tenantId);
 
 }

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

@@ -13,7 +13,7 @@ public interface TeacherCourseStatisticsDao extends BaseDAO<Long, TeacherCourseS
     int deleteByMonth(@Param("date") Date date);
 
     List<TeacherCourseStatistics> findUserByWarringSalary(@Param("startDate") Date startDate,
-                                                          @Param("endDate") Date endDate);
+                                                          @Param("endDate") Date endDate,@Param("tenantId") Integer tenantId);
 
     List<TeacherCourseStatistics> findUserCourseSalaryByUserIds(@Param("userIds") List<Integer> userIds,
                                                                 @Param("startDate") Date startDate,

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

@@ -89,7 +89,7 @@ public interface TeacherDao extends BaseDAO<Integer, Teacher> {
      * @author Joburgess
      * @date 2020/2/10
      */
-    List<SimpleUserDto> findSimpleTeachers(@Param("userIds") List<Integer> userIds);
+    List<SimpleUserDto> findSimpleTeachers(@Param("userIds") List<Integer> userIds, @Param("tenantId") Integer tenantId);
 
     List<SimpleUserDto> getUsersSimpleInfo(@Param("userIds") List<Integer> userIds);
 
@@ -296,16 +296,6 @@ public interface TeacherDao extends BaseDAO<Integer, Teacher> {
     List<Map<Integer, String>> queryUsernameByIds(@Param("userIds") List<Integer> userIds);
 
     /**
-     * @param params: 搜索参数
-     * @return java.util.List<com.ym.mec.biz.dal.entity.Teacher>
-     * @describe 教师搜索
-     * @author Joburgess
-     * @date 2020/1/7
-     */
-    @Deprecated
-    List<TeacherBasicDto> searchTeachers(Map<String, Object> params);
-
-    /**
      * 获取教师列表
      *
      * @param params
@@ -478,7 +468,7 @@ public interface TeacherDao extends BaseDAO<Integer, Teacher> {
      */
     int countStudent(Map<String, Object> params);
     
-    List<TeacherDefaultSalaryDto> queryTeacherDefaultSalary(@Param("organIdList") String organIdList);
+    List<TeacherDefaultSalaryDto> queryTeacherDefaultSalary(@Param("organIdList") String organIdList, @Param("tenantId") Integer tenantId);
 
     BasicUserDto findUserByPhone(String phone);
     /**
@@ -504,8 +494,6 @@ public interface TeacherDao extends BaseDAO<Integer, Teacher> {
      */
     String queryTeacherNameByTeacherIds(@Param("teachingTeacherIds") String teachingTeacherIds);
 
-    List<Integer> queryAllIds();
-
     void eduUpdateTeacher(Teacher teacher);
 
     /**

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

@@ -45,6 +45,6 @@ public interface TeacherSalaryComplaintsDao extends BaseDAO<Long, TeacherSalaryC
      * @param month:
      * @return int
      */
-    int updateComplaintStatusTuDoneWithMonth(@Param("month") String month);
+    int updateComplaintStatusTuDoneWithMonth(@Param("month") String month, @Param("tenantId") Integer tenantId);
 
 }

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

@@ -26,7 +26,7 @@ public interface VipGroupActivityDao extends BaseDAO<Integer, VipGroupActivity>
 
 	List<VipGroupActivity> queryByIds(@Param("activityIds") String activityIds);
 
-	List<VipGroupActivity> findByName(@Param("name") String name);
+	List<VipGroupActivity> findByName(@Param("name") String name, @Param("tenantId") Integer tenantId);
 
 	/**
 	 * 导出vip活动
@@ -42,7 +42,7 @@ public interface VipGroupActivityDao extends BaseDAO<Integer, VipGroupActivity>
 	* @author zx
 	* @date 2021/10/11 11:17
 	*/
-    List<WaitCourseActivityDto> queryWaitCourseActivity(@Param("teacherId") Integer teacherId, @Param("organId") String organId);
+    List<WaitCourseActivityDto> queryWaitCourseActivity(@Param("teacherId") Integer teacherId, @Param("organId") String organId, @Param("tenantId") Integer tenantId);
 
     /**
     * @description: 获取活动待排课学员数量

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

@@ -253,7 +253,7 @@ public interface VipGroupDao extends BaseDAO<Long, VipGroup> {
      * @param organId
      * @return
      */
-    Map<String, Integer> queryVipGroupNum(@Param("organId") String organId);
+    Map<String, Integer> queryVipGroupNum(@Param("organId") String organId, @Param("tenantId") Integer tenantId);
 
     /**
      * 查询当月vip课数量
@@ -261,7 +261,7 @@ public interface VipGroupDao extends BaseDAO<Long, VipGroup> {
      * @param organId
      * @return
      */
-    Integer queryCurrentMonthCoursesNum(@Param("organId") String organId);
+    Integer queryCurrentMonthCoursesNum(@Param("organId") String organId, @Param("tenantId") Integer tenantId);
 
     /**
      * @param :
@@ -270,7 +270,7 @@ public interface VipGroupDao extends BaseDAO<Long, VipGroup> {
      * @author Joburgess
      * @date 2019/11/13
      */
-    List<VipGroup> findNoCreateSuccessVipGroup();
+    List<VipGroup> findNoCreateSuccessVipGroup(Integer tenantId);
 
 
     /**
@@ -343,14 +343,7 @@ public interface VipGroupDao extends BaseDAO<Long, VipGroup> {
      */
     List<Map<Integer, String>> queryUserVipStatus(@Param("userIds") Set<Integer> userIds);
 
-    /**
-     * 临时用
-     *
-     * @return
-     */
-    List<VipCourseStudentInfoDto> queryVipCourseStudentInfo();
-
-    List<VipBuyResultDto> getGroupTeachers(@Param("groupIds") List<Long> groupIds);
+    List<VipBuyResultDto> getGroupTeachers(@Param("groupIds") List<Long> groupIds, @Param("tenantId") Integer tenantId);
 
     /**
      * 根据ids获取课程组信息

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

@@ -1,35 +1,24 @@
 package com.ym.mec.biz.dal.dao;
 
-import com.ym.mec.biz.dal.entity.VipGroupDefaultClassesCycle;
-import com.ym.mec.common.dal.BaseDAO;
+import java.util.List;
+
 import org.apache.ibatis.annotations.Param;
 
-import java.util.List;
+import com.ym.mec.biz.dal.entity.VipGroupDefaultClassesCycle;
+import com.ym.mec.common.dal.BaseDAO;
 
 public interface VipGroupDefaultClassesCycleDao extends BaseDAO<Integer, VipGroupDefaultClassesCycle> {
 
 
-    VipGroupDefaultClassesCycle checkMaxClassTimes(Integer maxClassTimes);
+    VipGroupDefaultClassesCycle checkMaxClassTimes(@Param("maxClassTimes") Integer maxClassTimes,@Param("tenantId") Integer tenantId);
 
     int batchInstert(List<VipGroupDefaultClassesCycle> vipGroupDefaultClassesCycles);
 
-    int deleteAll();
-
-    /**
-     * @Author: Joburgess
-     * @Date: 2019/10/8
-     * @params [maxClassTimes]
-     * @return com.ym.mec.biz.dal.entity.VipGroupDefaultClassesCycle
-     * @describe 根据最大课次获取上一梯度信息
-     */
-    VipGroupDefaultClassesCycle findByMaxClassTimes(Integer maxClassTimes);
-
-
-    VipGroupDefaultClassesCycle findByMinClassTimes(Integer minClassTimes);
+    int deleteAll(Integer tenantId);
 
-    int countAll();
+    int countAll(Integer tenantId);
 
-    List<VipGroupDefaultClassesCycle> findAllCycle();
+    List<VipGroupDefaultClassesCycle> findAllCycle(Integer tenantId);
 
     /**
      * @describe 根据乐团获取指定课次课排课范围
@@ -38,6 +27,6 @@ public interface VipGroupDefaultClassesCycleDao extends BaseDAO<Integer, VipGrou
      * @param classTimes: 课次
      * @return com.ym.mec.biz.dal.entity.VipGroupDefaultClassesCycle
      */
-    VipGroupDefaultClassesCycle findByOrganAndClassTimes(@Param("classTimes") Integer classTimes);
+    VipGroupDefaultClassesCycle findByOrganAndClassTimes(@Param("classTimes") Integer classTimes,@Param("tenantId") Integer tenantId);
 
 }

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

@@ -28,6 +28,4 @@ public interface VipGroupDefaultClassesUnitPriceDao extends BaseDAO<Integer, Vip
 
     int updateByVipGroupCategory(VipGroupDefaultClassesUnitPrice vipGroupDefaultClassesUnitPrice);
 
-    List<VipGroupDefaultClassesUnitPrice> findAllByOrgan(Long organId);
-
 }

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

@@ -28,12 +28,6 @@ public interface TeacherCourseRewardService extends BaseService<Long, TeacherCou
      * @return com.ym.mec.common.page.PageInfo<com.ym.mec.biz.dal.dto.TeacherCourseSalaryDetail4WebDto>
      */
     PageInfo<TeacherCourseSalaryDetail4WebDto> findTeacherRewards(CourseSalaryQueryInfo4Web queryInfo);
-    /**
-     * 根据结算状态获取列表
-     * @param settlementStatus
-     * @return
-     */
-    List<TeacherCourseReward> findBySettlementStatus(int settlementStatus);
 
     /**
      * 批量修改

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

@@ -211,12 +211,6 @@ public interface TeacherService extends BaseService<Integer, Teacher> {
     List<TeacherDefaultSalaryDto> queryTeacherDefaultSalary(String organIdList);
 
     /**
-     * 获取所有教师编号列表
-     * @return
-     */
-    List<Integer> queryAllIds();
-
-    /**
      * @describe 查询教师关联的乐团预览信息
      * @author Joburgess
      * @date 2021/8/12 0012

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

@@ -17,6 +17,7 @@ import com.ym.mec.biz.dal.page.VipGroupTeachingRecordQueryInfo;
 import com.ym.mec.common.entity.HttpResponseResult;
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.service.BaseService;
+
 import org.springframework.web.multipart.MultipartFile;
 
 public interface VipGroupService extends BaseService<Long, VipGroup> {
@@ -429,7 +430,7 @@ public interface VipGroupService extends BaseService<Long, VipGroup> {
      * @date 2019/11/13
      * @return void
      */
-    void stopVipGroupWithNoCreate();
+    void stopVipGroupWithNoCreate(Integer tenantId);
 
     /**
      * @describe 添加vip课学员

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

@@ -1051,7 +1051,7 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
             return;
         }
         courseScheduleTeacherSalaryDao.updateTeacherSalaryConfirmStatus(teacherSalaryIds,TeacherSalaryConfirmStatus.CONFIRMED);
-        teacherCourseRewardDao.updateTeacherRewardConfirmStatusWithMonth(month, teacherId, TeacherSalaryConfirmStatus.CONFIRMED);
+        teacherCourseRewardDao.updateTeacherRewardConfirmStatusWithMonth(month, teacherId, TeacherSalaryConfirmStatus.CONFIRMED, TenantContextHolder.getTenantId());
     }
 
     @Override
@@ -1154,7 +1154,7 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
             return;
         }
         courseScheduleTeacherSalaryDao.updateTeacherSalaryConfirmStatus(teacherSalaryIds,TeacherSalaryConfirmStatus.UNCONFIRMED);
-        teacherCourseRewardDao.updateTeacherRewardConfirmStatusWithMonth(month, null, TeacherSalaryConfirmStatus.UNCONFIRMED);
+        teacherCourseRewardDao.updateTeacherRewardConfirmStatusWithMonth(month, null, TeacherSalaryConfirmStatus.UNCONFIRMED, TenantContextHolder.getTenantId());
         String teacherBaseUrl = sysConfigDao.findByParamName(SysConfigService.TEACHER_BASE_URL).getParanValue();
         String notifyUrl="8?"+teacherBaseUrl+"/#/remuneration?month=" + month;
         String monthStr = DateUtil.dateToString(DateUtil.stringToDate(month, "yyyy-MM"),"M月");
@@ -1176,8 +1176,8 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
             return;
         }
         courseScheduleTeacherSalaryDao.updateTeacherSalaryConfirmStatusToComplied(teacherSalaryIds);
-        teacherSalaryComplaintsDao.updateComplaintStatusTuDoneWithMonth(month);
-        teacherCourseRewardDao.updateTeacherRewardConfirmStatusWithMonth(month, null, TeacherSalaryConfirmStatus.COMPLETED);
+        teacherSalaryComplaintsDao.updateComplaintStatusTuDoneWithMonth(month, TenantContextHolder.getTenantId());
+        teacherCourseRewardDao.updateTeacherRewardConfirmStatusWithMonth(month, null, TeacherSalaryConfirmStatus.COMPLETED, TenantContextHolder.getTenantId());
     }
 
     @Override

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

@@ -402,7 +402,7 @@ public class CoursesGroupServiceImpl extends BaseServiceImpl<Long, CoursesGroup>
             List<GroupBaseCourseInfoDto> groupFinishedClassesTimes = groupDao.countGroupFinishedClassesTimes(groupIds, GroupType.COMM);
             Map<String, Integer> groupFinishedClassesTimesMap = groupFinishedClassesTimes.stream().collect(Collectors.toMap(GroupBaseCourseInfoDto::getId, e -> e.getCurrentClassTimes()));
 
-            List<SimpleUserDto> teachers = teacherDao.findSimpleTeachers(teacherIds);
+            List<SimpleUserDto> teachers = teacherDao.findSimpleTeachers(teacherIds, queryInfo.getTenantId());
             Map<Integer, String> idNameMap = teachers.stream().collect(Collectors.toMap(SimpleUserDto::getUserId, SimpleUserDto::getUserName));
 
             for (CourseGroupExtendDto teacherCourseGroup : teacherCourseGroups) {

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

@@ -217,7 +217,7 @@ public class ExtracurricularExercisesReplyServiceImpl extends BaseServiceImpl<Lo
 			dataList = extracurricularExercisesReplyDao.findExtraExercises(params);
 			List<Long> replyIds = dataList.stream().map(ExtraExerciseStudentsDto::getId).collect(Collectors.toList());
 			List<Integer> teacherIds = dataList.stream().map(ExtraExerciseStudentsDto::getTeacherId).collect(Collectors.toList());
-			List<SimpleUserDto> teachers = teacherDao.findSimpleTeachers(teacherIds);
+			List<SimpleUserDto> teachers = teacherDao.findSimpleTeachers(teacherIds, queryInfo.getTenantId());
 			Map<Integer, String> idNameMap = teachers.stream().collect(Collectors.toMap(SimpleUserDto::getUserId, SimpleUserDto::getUserName));
 			for (ExtraExerciseStudentsDto extraExerciseStudentsDto : dataList) {
 				extraExerciseStudentsDto.setTeacherName(idNameMap.get(extraExerciseStudentsDto.getTeacherId()));

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

@@ -355,7 +355,7 @@ public class StudentCourseHomeworkServiceImpl extends BaseServiceImpl<Long, Stud
             dataList = studentCourseHomeworkDao.findStudentHomeworkRecord(params);
             if (!CollectionUtils.isEmpty(dataList)) {
                 List<Integer> teacherIds = dataList.stream().map(StudentHomeworkRecordDto::getTeacherId).collect(Collectors.toList());
-                List<SimpleUserDto> teachers = teacherDao.findSimpleTeachers(teacherIds);
+                List<SimpleUserDto> teachers = teacherDao.findSimpleTeachers(teacherIds, queryInfo.getTenantId());
                 Map<Integer, String> idNameMap = teachers.stream().collect(Collectors.toMap(SimpleUserDto::getUserId, u -> u.getUserName()));
                 for (StudentHomeworkRecordDto studentHomeworkRecordDto : dataList) {
                     studentHomeworkRecordDto.setTeacherName(idNameMap.get(studentHomeworkRecordDto.getTeacherId()));

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

@@ -587,7 +587,7 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 			return true;
 		}
 		Integer minutes = Integer.parseInt(configValue);
-		List<Mapper> list = teacherAttendanceDao.queryNoSignOutListByOverMinutes(minutes);
+		List<Mapper> list = teacherAttendanceDao.queryNoSignOutListByOverMinutes(minutes, tenantId);
 		if(CollectionUtils.isEmpty(list)){
 			return true;
 		}

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

@@ -113,11 +113,6 @@ public class TeacherCourseRewardServiceImpl extends BaseServiceImpl<Long, Teache
     }
 
     @Override
-    public List<TeacherCourseReward> findBySettlementStatus(int settlementStatus) {
-        return teacherCourseRewardDao.findBySettlementStatus(settlementStatus);
-    }
-
-    @Override
     @Transactional(rollbackFor = Exception.class)
     public void batchUpdate(List<TeacherCourseReward> teacherCourseRewards) {
         teacherCourseRewardDao.batchUpdate(teacherCourseRewards);

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

@@ -12,9 +12,10 @@ import com.ym.mec.biz.service.TeacherCourseStatisticsService;
 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.common.tenant.TenantContextHolder;
 import com.ym.mec.util.collection.MapUtil;
-
 import com.ym.mec.util.date.DateUtil;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -58,7 +59,7 @@ public class TeacherCourseStatisticsServiceImpl extends BaseServiceImpl<Long, Te
         Date nextMonthDate = new Date();
         Date startDate = DateUtil.getFirstDayOfMonth(nextMonthDate);
         Date endDate = DateUtil.getLastDayOfMonth(nextMonthDate);
-        List<TeacherCourseStatistics> teacherCourseStatisticsList = teacherCourseStatisticsDao.findUserByWarringSalary(startDate, endDate);
+        List<TeacherCourseStatistics> teacherCourseStatisticsList = teacherCourseStatisticsDao.findUserByWarringSalary(startDate, endDate, TenantContextHolder.getTenantId());
         if (teacherCourseStatisticsList.size() == 0) {
             return;
         }

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

@@ -19,6 +19,7 @@ import java.util.stream.Collectors;
 import com.ym.mec.biz.dal.dao.*;
 import com.ym.mec.biz.dal.dto.*;
 import com.ym.mec.biz.dal.page.*;
+
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -52,6 +53,7 @@ import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.page.QueryInfo;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
+import com.ym.mec.common.tenant.TenantContextHolder;
 import com.ym.mec.im.ImFeignService;
 import com.ym.mec.util.collection.MapUtil;
 import com.ym.mec.util.date.DateUtil;
@@ -742,12 +744,7 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher>  imple
 
 	@Override
 	public List<TeacherDefaultSalaryDto> queryTeacherDefaultSalary(String organIdList) {
-		return teacherDao.queryTeacherDefaultSalary(organIdList);
-	}
-
-	@Override
-	public List<Integer> queryAllIds() {
-		return teacherDao.queryAllIds();
+		return teacherDao.queryTeacherDefaultSalary(organIdList,TenantContextHolder.getTenantId());
 	}
 
 	@Override

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

@@ -15,7 +15,9 @@ import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
+import com.ym.mec.common.tenant.TenantContextHolder;
 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;
@@ -169,7 +171,7 @@ public class VipGroupActivityServiceImpl extends BaseServiceImpl<Integer, VipGro
 
     @Override
     public List<WaitCourseActivityDto> queryWaitCourseActivity(Integer teacherId,String organId) {
-		return vipGroupActivityDao.queryWaitCourseActivity(teacherId,organId);
+		return vipGroupActivityDao.queryWaitCourseActivity(teacherId,organId, TenantContextHolder.getTenantId());
     }
 
     @Override

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

@@ -6,6 +6,8 @@ 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 com.ym.mec.common.tenant.TenantContextHolder;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -27,26 +29,28 @@ public class VipGroupDefaultClassesCycleServiceImpl extends BaseServiceImpl<Inte
 
 	@Override
 	public long insert(VipGroupDefaultClassesCycle bean) {
+		
+		Integer tenantId = TenantContextHolder.getTenantId();
 
-		if(vipGroupDefaultClassesCycleDao.countAll()<=0){
+		if(vipGroupDefaultClassesCycleDao.countAll(tenantId)<=0){
 			bean.setMinClassTimes(0);
 			return super.insert(bean);
 		}else{
-			VipGroupDefaultClassesCycle checkMaxClassTimes = vipGroupDefaultClassesCycleDao.checkMaxClassTimes(bean.getMaxClassTimes());
+			VipGroupDefaultClassesCycle checkMaxClassTimes = vipGroupDefaultClassesCycleDao.checkMaxClassTimes(bean.getMaxClassTimes(),tenantId);
 			if(null!=checkMaxClassTimes){
 				throw new BizException("已存在包含该课次的设置!");
 			}
-			List<VipGroupDefaultClassesCycle> allRecord = vipGroupDefaultClassesCycleDao.findAllCycle();
+			List<VipGroupDefaultClassesCycle> allRecord = vipGroupDefaultClassesCycleDao.findAllCycle(tenantId);
 			allRecord.add(bean);
 			allRecord=createMinClassTimess(allRecord);
-			vipGroupDefaultClassesCycleDao.deleteAll();
+			vipGroupDefaultClassesCycleDao.deleteAll(tenantId);
 			return vipGroupDefaultClassesCycleDao.batchInstert(allRecord);
 		}
 	}
 
 	@Override
 	public List<VipGroupDefaultClassesCycle> findAllCycle() {
-		return vipGroupDefaultClassesCycleDao.findAllCycle();
+		return vipGroupDefaultClassesCycleDao.findAllCycle(TenantContextHolder.getTenantId());
 	}
 
 	@Override
@@ -60,12 +64,12 @@ public class VipGroupDefaultClassesCycleServiceImpl extends BaseServiceImpl<Inte
 	@Override
 	public int delete(Integer id) {
 		super.delete(id);
-		List<VipGroupDefaultClassesCycle> allRecord = vipGroupDefaultClassesCycleDao.findAllCycle();
+		List<VipGroupDefaultClassesCycle> allRecord = vipGroupDefaultClassesCycleDao.findAllCycle(TenantContextHolder.getTenantId());
 		allRecord=createMinClassTimess(allRecord);
 		if (allRecord == null || allRecord.size() == 0) {
 			return 1;
 		}
-		vipGroupDefaultClassesCycleDao.deleteAll();
+		vipGroupDefaultClassesCycleDao.deleteAll(TenantContextHolder.getTenantId());
 		return vipGroupDefaultClassesCycleDao.batchInstert(allRecord);
 	}
 

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

@@ -20,11 +20,13 @@ import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.service.IdGeneratorService;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
+import com.ym.mec.common.tenant.TenantContextHolder;
 import com.ym.mec.thirdparty.message.MessageSenderPluginContext;
 import com.ym.mec.util.collection.MapUtil;
 import com.ym.mec.util.date.DateConvertor;
 import com.ym.mec.util.date.DateUtil;
 import com.ym.mec.util.string.MessageFormatter;
+
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -273,7 +275,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 				throw new BizException("课时安排时间超出范围!");
 			}
 		}else{
-			VipGroupDefaultClassesCycle vipGroupDefaultClassesCycle = vipGroupDefaultClassesCycleDao.findByOrganAndClassTimes(totalClassTimes);
+			VipGroupDefaultClassesCycle vipGroupDefaultClassesCycle = vipGroupDefaultClassesCycleDao.findByOrganAndClassTimes(totalClassTimes, TenantContextHolder.getTenantId());
 
 			if (vipGroupDefaultClassesCycle != null) {
 				int month = DateUtil.monthsBetween(firstCourseSchedule.getStartClassTime(), latestCourseSchedule.getEndClassTime());
@@ -547,7 +549,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 				throw new BizException("课时安排时间超出范围!");
 			}
 		}else{
-			VipGroupDefaultClassesCycle vipGroupDefaultClassesCycle = vipGroupDefaultClassesCycleDao.findByOrganAndClassTimes(totalClassTimes);
+			VipGroupDefaultClassesCycle vipGroupDefaultClassesCycle = vipGroupDefaultClassesCycleDao.findByOrganAndClassTimes(totalClassTimes, TenantContextHolder.getTenantId());
 
 			if (vipGroupDefaultClassesCycle != null) {
 				int month = DateUtil.monthsBetween(firstCourseSchedule.getStartClassTime(), latestCourseSchedule.getEndClassTime());
@@ -877,7 +879,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 				throw new BizException("课时安排时间超出范围!");
 			}
 		}else{
-			VipGroupDefaultClassesCycle vipGroupDefaultClassesCycle = vipGroupDefaultClassesCycleDao.findByOrganAndClassTimes(totalClassTimes);
+			VipGroupDefaultClassesCycle vipGroupDefaultClassesCycle = vipGroupDefaultClassesCycleDao.findByOrganAndClassTimes(totalClassTimes, TenantContextHolder.getTenantId());
 
 			if (vipGroupDefaultClassesCycle != null) {
 				int month = DateUtil.monthsBetween(firstCourseSchedule.getStartClassTime(), latestCourseSchedule.getEndClassTime());
@@ -1264,7 +1266,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 				throw new BizException("课时安排时间超出范围!");
 			}
 		}else{
-			VipGroupDefaultClassesCycle vipGroupDefaultClassesCycle = vipGroupDefaultClassesCycleDao.findByOrganAndClassTimes(totalClassTimes);
+			VipGroupDefaultClassesCycle vipGroupDefaultClassesCycle = vipGroupDefaultClassesCycleDao.findByOrganAndClassTimes(totalClassTimes, TenantContextHolder.getTenantId());
 
 			if (vipGroupDefaultClassesCycle != null) {
 				int month = DateUtil.monthsBetween(firstCourseSchedule.getStartClassTime(), latestCourseSchedule.getEndClassTime());
@@ -1598,7 +1600,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 			List<VipGroupCategory> vipGroupCategories = vipGroupCategoryDao.findAllByOrgan(student.getOrganId().toString());
 			VipGroupCategory vipGroupCategory = vipGroupCategories.stream().filter(v -> v.getName().equals(vipGroupCategoryName)).findFirst().get();
 
-			List<VipGroupActivity> vipGroupActivities = vipGroupActivityDao.findByName(vipGroupActivityName);
+			List<VipGroupActivity> vipGroupActivities = vipGroupActivityDao.findByName(vipGroupActivityName, TenantContextHolder.getTenantId());
 			VipGroupActivity vipGroupActivity = null;
 			if(!CollectionUtils.isEmpty(vipGroupActivities)){
 				vipGroupActivity = vipGroupActivities.get(0);
@@ -1817,7 +1819,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 				}
 			}else {
 				int totalClassTimes = courseScheduleDao.countGroupAllCourses(GroupType.VIP, vipGroupId.toString());
-				VipGroupDefaultClassesCycle vipGroupDefaultClassesCycle = vipGroupDefaultClassesCycleDao.findByOrganAndClassTimes(totalClassTimes);
+				VipGroupDefaultClassesCycle vipGroupDefaultClassesCycle = vipGroupDefaultClassesCycleDao.findByOrganAndClassTimes(totalClassTimes, TenantContextHolder.getTenantId());
 
 				if (vipGroupDefaultClassesCycle != null) {
 					Date expectEndCourseTime = DateUtil.addMonths(groupCourseStartTime, vipGroupDefaultClassesCycle.getMonth());
@@ -4552,8 +4554,8 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	public void stopVipGroupWithNoCreate() {
-		List<VipGroup> noCreateSuccessVipGroups = vipGroupDao.findNoCreateSuccessVipGroup();
+	public void stopVipGroupWithNoCreate(Integer tenantId) {
+		List<VipGroup> noCreateSuccessVipGroups = vipGroupDao.findNoCreateSuccessVipGroup(tenantId);
 		if(CollectionUtils.isEmpty(noCreateSuccessVipGroups)){
 			return;
 		}

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

@@ -17,6 +17,7 @@
 		<result column="type_" property="type" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
+        <result column="tenant_id_" property="tenantId"/>
 	</resultMap>
 	
 	<resultMap type="com.ym.mec.biz.dal.dto.ImGroupMemberDto" id="ImGroupMemberDto">
@@ -46,7 +47,7 @@
 	
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="ImGroup">
-		SELECT * FROM im_group ORDER BY id_
+		SELECT * FROM im_group where tenant_id_ = #{tenantId} ORDER BY id_
 	</select>
 	
 	<!-- 向数据库增加一条记录 -->
@@ -56,8 +57,8 @@
 		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
 		</selectKey>
 		-->
-		INSERT INTO im_group (id_,name_,introduce_,member_num_,memo_,tags_,img_,type_,create_time_,update_time_)
-		VALUES(#{id},#{name},#{introduce},#{memberNum},#{memo},#{tags},#{img},#{type},#{createTime},#{updateTime})
+		INSERT INTO im_group (id_,name_,introduce_,member_num_,memo_,tags_,img_,type_,create_time_,update_time_,tenant_id_)
+		VALUES(#{id},#{name},#{introduce},#{memberNum},#{memo},#{tags},#{img},#{type},#{createTime},#{updateTime},#{tenantId})
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -93,7 +94,7 @@
 		<if test="createTime != null">
 		create_time_ = #{createTime},
 		</if>
-		</set> WHERE id_ = #{id} 
+		</set> WHERE id_ = #{id} and tenant_id_ = #{tenantId}
 	</update>
     <update id="updateNickname">
 		UPDATE im_group_member SET nickname_ = #{nickName} WHERE user_id_ = #{userId}
@@ -115,12 +116,12 @@
 	
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="ImGroup" parameterType="map">
-		SELECT * FROM im_group ORDER BY id_ <include refid="global.limit"/>
+		SELECT * FROM im_group where tenant_id_ = #{tenantId} ORDER BY id_ <include refid="global.limit"/>
 	</select>
 	
 	<!-- 查询当前表的总记录数 -->
 	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM im_group
+		SELECT COUNT(*) FROM im_group where tenant_id_ = #{tenantId}
 	</select>
 	
 	<select id="queryByUserId" resultMap="ImGroup" parameterType="map">

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

@@ -15,6 +15,7 @@
 		<result column="role_type_" property="roleType"/>
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
+        <result column="tenant_id_" property="tenantId"/>
 	</resultMap>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -24,19 +25,19 @@
 	
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="ImGroupMember">
-		SELECT * FROM im_group_member ORDER BY id_
+		SELECT * FROM im_group_member where tenant_id_ = #{tenantId} ORDER BY id_
 	</select>
 	
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.ImGroupMember" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		INSERT INTO im_group_member (im_group_id_,user_id_,nickname_,is_admin_,role_type_,create_time_,update_time_) 
-		VALUES(#{imGroupId},#{userId},#{nickname},#{isAdmin},#{roleType},NOW(),NOW())
+		INSERT INTO im_group_member (im_group_id_,user_id_,nickname_,is_admin_,role_type_,create_time_,update_time_,tenant_id_) 
+		VALUES(#{imGroupId},#{userId},#{nickname},#{isAdmin},#{roleType},NOW(),NOW(),#{tenantId})
 	</insert>
 	
 	<insert id="batchInsert" parameterType="com.ym.mec.biz.dal.entity.ImGroupMember" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		INSERT INTO im_group_member (im_group_id_,user_id_,nickname_,is_admin_,role_type_,create_time_,update_time_) VALUES
+		INSERT INTO im_group_member (im_group_id_,user_id_,nickname_,is_admin_,role_type_,create_time_,update_time_,tenant_id_) VALUES
 		 <foreach collection="list" item="item" separator=",">
-		(#{item.imGroupId},#{item.userId},#{item.nickname},#{item.isAdmin},#{item.roleType},NOW(),NOW())
+		(#{item.imGroupId},#{item.userId},#{item.nickname},#{item.isAdmin},#{item.roleType},NOW(),NOW(),#{item.tenantId})
 		</foreach>
 	</insert>
 	
@@ -59,7 +60,7 @@
 		im_group_id_ = #{imGroupId},
 		</if>
 		update_time_ = NOW()
-		</set> WHERE id_ = #{id} 
+		</set> WHERE id_ = #{id} and tenant_id_ = #{tenantId}
 	</update>
 	
 	<update id="batchUpdate" parameterType="com.ym.mec.biz.dal.entity.ImGroupMember">
@@ -83,7 +84,7 @@
 				</if>
 				update_time_ = NOW()
 			</set>
-			WHERE id_ = #{item.id}
+			WHERE id_ = #{item.id} and tenant_id_ = #{item.tenantId}
 		</foreach> 
 	</update>
 	
@@ -94,12 +95,12 @@
 	
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="ImGroupMember" parameterType="map">
-		SELECT * FROM im_group_member ORDER BY id_ <include refid="global.limit"/>
+		SELECT * FROM im_group_member where tenant_id_ = #{tenantId} ORDER BY id_ <include refid="global.limit"/>
 	</select>
 	
 	<!-- 查询当前表的总记录数 -->
 	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM im_group_member
+		SELECT COUNT(*) FROM im_group_member  where tenant_id_ = #{tenantId}
 	</select>
 	
 	<delete id="deleteByImGroupId" >

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

@@ -17,6 +17,7 @@
 		<result column="update_time_" property="updateTime" />
 		<result column="del_flag_" property="delFlag" />
 		<result column="operator_id_" property="operatorId" />
+        <result column="tenant_id_" property="tenantId"/>
 	</resultMap>
 	
 	<resultMap type="com.ym.mec.biz.dal.dto.ImGroupNoticeDto" id="ImGroupNoticeDto" extends="ImGroupNotice">
@@ -31,7 +32,7 @@
 	
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="ImGroupNotice">
-		SELECT * FROM im_group_notice ORDER BY id_
+		SELECT * FROM im_group_notice where tenant_id_ = #{tenantId} ORDER BY id_
 	</select>
 	
 	<!-- 向数据库增加一条记录 -->
@@ -41,7 +42,7 @@
 		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
 		</selectKey>
 		-->
-		INSERT INTO im_group_notice (id_,im_group_id_,title_,content_,is_top_,is_sent_to_new_member_,create_time_,update_time_,del_flag_,operator_id_) VALUES(#{id},#{imGroupId},#{title},#{content},#{isTop},#{isSentToNewMember},#{createTime},#{updateTime},#{delFlag},#{operatorId})
+		INSERT INTO im_group_notice (id_,im_group_id_,title_,content_,is_top_,is_sent_to_new_member_,create_time_,update_time_,del_flag_,operator_id_,tenant_id_) VALUES(#{id},#{imGroupId},#{title},#{content},#{isTop},#{isSentToNewMember},#{createTime},#{updateTime},#{delFlag},#{operatorId},#{tenantId})
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -77,7 +78,7 @@
 		<if test="createTime != null">
 		create_time_ = #{createTime},
 		</if>
-		</set> WHERE id_ = #{id} 
+		</set> WHERE id_ = #{id} and tenant_id_ = #{tenantId}
 	</update>
 	
 	<!-- 根据主键删除一条记录 -->
@@ -89,7 +90,7 @@
 	<select id="queryForPage" resultMap="ImGroupNoticeDto" parameterType="map">
 		SELECT ign.*,u.real_name_,u.avatar_ FROM im_group_notice ign left join sys_user u on ign.operator_id_ = u.id_
 		<where>
-            ign.del_flag_ = 0
+            ign.del_flag_ = 0 and ign.tenant_id_ = #{tenantId}
             <if test="groupId != null">
                 AND ign.im_group_id_ = #{groupId}
             </if>
@@ -102,7 +103,7 @@
 	<select id="queryCount" resultType="int">
 		SELECT COUNT(ign.id_) FROM im_group_notice ign
 		<where>
-            ign.del_flag_ = 0
+            ign.del_flag_ = 0 and ign.tenant_id_ = #{tenantId}
             <if test="groupId != null">
                 AND ign.im_group_id_ = #{groupId}
             </if>

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

@@ -18,6 +18,7 @@
 		<result column="subject_id_" property="subjectId" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
+        <result column="tenant_id_" property="tenantId"/>
 	</resultMap>
 	
 	<resultMap type="com.ym.mec.biz.dal.dto.ImUserFriendDto" id="ImUserFriendDto" extends="ImUserFriend">
@@ -34,18 +35,18 @@
 	
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="ImUserFriend">
-		SELECT * FROM im_user_friend ORDER BY id_
+		SELECT * FROM im_user_friend where tenant_id_ = #{tenantId} ORDER BY id_
 	</select>
 	
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.ImUserFriend" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		INSERT INTO im_user_friend (id_,user_id_,friend_id_,friend_nickname_,memo_,tags_,create_time_,update_time_)
-		VALUES(#{id},#{userId},#{friendId},#{friendNickname},#{memo},#{tags},NOW(),NOW())
+		INSERT INTO im_user_friend (id_,user_id_,friend_id_,friend_nickname_,memo_,tags_,create_time_,update_time_,tenant_id_)
+		VALUES(#{id},#{userId},#{friendId},#{friendNickname},#{memo},#{tags},NOW(),NOW(),#{tenantId})
 	</insert>
 
 	<insert id="insertByBasicUser">
-		INSERT INTO im_user_friend (user_id_,friend_id_,friend_nickname_,tags_,memo_,create_time_,update_time_)
-		VALUES (#{teacherId},#{basicUserDto.userId},#{basicUserDto.name},#{basicUserDto.subjectName},#{basicUserDto.musicGroupName},NOW(),NOW())
+		INSERT INTO im_user_friend (user_id_,friend_id_,friend_nickname_,tags_,memo_,create_time_,update_time_,tenant_id_)
+		VALUES (#{teacherId},#{basicUserDto.userId},#{basicUserDto.name},#{basicUserDto.subjectName},#{basicUserDto.musicGroupName},NOW(),NOW(),#{basicUserDto.tenantId})
 	</insert>
 
 	<!-- 根据主键查询一条记录 -->
@@ -67,7 +68,7 @@
 		tags_ = #{tags},
 		</if>
 		update_time_ = NOW()
-		</set> WHERE id_ = #{id}
+		</set> WHERE id_ = #{id} and tenant_id_ = #{tenantId}
 	</update>
 	
 	<!-- 根据主键删除一条记录 -->
@@ -80,12 +81,12 @@
 
     <!-- 分页查询 -->
 	<select id="queryPage" resultMap="ImUserFriend" parameterType="map">
-		SELECT * FROM im_user_friend ORDER BY id_ <include refid="global.limit"/>
+		SELECT * FROM im_user_friend where tenant_id_ = #{tenantId} ORDER BY id_ <include refid="global.limit"/>
 	</select>
 	
 	<!-- 查询当前表的总记录数 -->
 	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM im_user_friend
+		SELECT COUNT(*) FROM im_user_friend where tenant_id_ = #{tenantId}
 	</select>
 	
 	<select id="query" resultMap="ImUserFriend" parameterType="map">

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

@@ -13,6 +13,7 @@
 		<result column="memo_" property="memo" />
 		<result column="create_time_" property="createTime" />
 		<result column="version_" property="version" />
+        <result column="tenant_id_" property="tenantId"/>
 	</resultMap>
 
 	<!-- 根据主键查询一条记录 -->
@@ -23,7 +24,7 @@
 
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="SysUserContracts">
-		SELECT * FROM sys_user_contracts
+		SELECT * FROM sys_user_contracts where tenant_id_ = #{tenantId}
 		ORDER BY id_
 	</select>
 
@@ -33,8 +34,8 @@
 		<!-- <selectKey resultClass="int" keyProperty="id" > SELECT SEQ_WSDEFINITION_ID.nextval 
 			AS ID FROM DUAL </selectKey> -->
 		INSERT INTO sys_user_contracts
-		(id_,user_id_,contract_no_,type_,url_,memo_,create_time_,version_)
-		VALUES(#{id},#{userId},#{contractNo},#{type},#{url},#{memo},#{createTime},#{version})
+		(id_,user_id_,contract_no_,type_,url_,memo_,create_time_,version_,tenant_id_)
+		VALUES(#{id},#{userId},#{contractNo},#{type},#{url},#{memo},#{createTime},#{version},#{tenantId})
 	</insert>
 
 	<!-- 根据主键查询一条记录 -->
@@ -63,7 +64,7 @@
 				create_time_ = #{createTime},
 			</if>
 		</set>
-		WHERE id_ = #{id}
+		WHERE id_ = #{id} and tenant_id_ = #{tenantId}
 	</update>
 
 	<!-- 根据主键删除一条记录 -->
@@ -75,14 +76,14 @@
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="SysUserContracts"
 			parameterType="map">
-		SELECT * FROM sys_user_contracts ORDER BY id_
+		SELECT * FROM sys_user_contracts where tenant_id_ = #{tenantId} ORDER BY id_
 		<include refid="global.limit" />
 	</select>
 
 	<!-- 查询当前表的总记录数 -->
 	<select id="queryCount" resultType="int">
 		SELECT COUNT(*) FROM
-		sys_user_contracts
+		sys_user_contracts where tenant_id_ = #{tenantId}
 	</select>
 
 	<select id="getUserContractWithType" resultMap="SysUserContracts">

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

@@ -27,6 +27,7 @@
 		<result column="organ_name_" property="organName" />
 		<result column="platform_account_no_" property="platformAccountNo" />
 		<result column="group_id_" property="groupId" />
+        <result column="tenant_id_" property="tenantId"/>
 	</resultMap>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -36,17 +37,17 @@
 	
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="SysUserCoursesAccountDetail">
-		SELECT * FROM sys_user_courses_account_detail ORDER BY id_
+		SELECT * FROM sys_user_courses_account_detail where tenant_id_ = #{tenantId} ORDER BY id_
 	</select>
 	
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.SysUserCoursesAccountDetail" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
 		INSERT INTO sys_user_courses_account_detail (id_,user_id_,trans_no_,type_,trans_type_,status_,amount_,balance_,
-		                                             description_,comment_,attribute1_,channel_,platform_account_no_,create_time_,update_time_,group_id_)
+		                                             description_,comment_,attribute1_,channel_,platform_account_no_,create_time_,update_time_,group_id_,tenant_id_)
 		VALUES(#{id},#{userId},#{transNo},#{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
 		       #{transType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
 		       #{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{amount},#{balance},#{description},
-		       #{comment},#{attribute1},#{channel},#{platformAccountNo},NOW(),NOW(),#{groupId})
+		       #{comment},#{attribute1},#{channel},#{platformAccountNo},NOW(),NOW(),#{groupId},#{tenantId})
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -94,7 +95,7 @@
 			</if>
 			update_time_ = NOW()
 		</set>
-		WHERE id_ = #{id}
+		WHERE id_ = #{id} and tenant_id_ = #{tenantId}
 	</update>
 	
 	<!-- 根据主键删除一条记录 -->
@@ -104,6 +105,7 @@
 
 	<sql id="queryPageCondition">
 		<where>
+			tenant_id_ = #{tenantId}
 			<if test="userId!=null">
 				user_id_=#{userId}
 			</if>
@@ -129,6 +131,7 @@
 		LEFT JOIN student s ON s.user_id_ = su.id_
 		LEFT JOIN `subject` sb ON FIND_IN_SET(sb.id_,s.subject_id_list_)
 		<where>
+			cad.tenant_id_ = #{tenantId}
 			<if test="queryInfo.userId != null">
 				AND cad.user_id_ = #{queryInfo.userId}
 			</if>

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

@@ -37,6 +37,7 @@
         <result column="url_" property="url"/>
         <result column="sign_in_device_no_" property="signInDeviceNo"/>
         <result column="sign_out_device_no_" property="signOutDeviceNo"/>
+        <result column="tenant_id_" property="tenantId"/>
     </resultMap>
     
     <resultMap type="com.ym.mec.biz.dal.dto.Mapper" id="Mapper">
@@ -52,7 +53,7 @@
 
     <!-- 全查询 -->
     <select id="findAll" resultMap="TeacherAttendance">
-		SELECT * FROM teacher_attendance ORDER BY id_
+		SELECT * FROM teacher_attendance whre tenant_id_ = #{tenantId} ORDER BY id_
 	</select>
 
     <!-- 向数据库增加一条记录 -->
@@ -61,12 +62,12 @@
         INSERT INTO teacher_attendance
         (group_type_,teacher_id_,music_group_id_,class_group_id_,course_schedule_id_,sign_in_time_,sign_in_status_,remark_,create_time_,sign_out_time_,
         sign_out_status_,current_class_times_,sign_in_longitude_latitude_,sign_out_longitude_latitude_,current_schedule_id_,sign_out_attachments_,
-        sign_out_remark_,update_attendance_type_,url_,sign_in_device_no_,sign_out_device_no_)
+        sign_out_remark_,update_attendance_type_,url_,sign_in_device_no_,sign_out_device_no_,tenant_id_)
         VALUES(#{groupType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{teacherId},
         #{musicGroupId},#{classGroupId},#{courseScheduleId},#{signInTime},#{signInStatus,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{remark},
         now(),#{signOutTime},#{signOutStatus,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
         #{currentClassTimes},#{signInLongitudeLatitude},#{signOutLongitudeLatitude},#{currentScheduleId},#{signOutAttachments},#{signOutRemark},
-        #{updateAttendanceEnum,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{url},#{signInDeviceNo},#{signOutDeviceNo})
+        #{updateAttendanceEnum,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{url},#{signInDeviceNo},#{signOutDeviceNo},#{tenantId})
     </insert>
 
     <insert id="batchInsert" parameterType="com.ym.mec.biz.dal.entity.TeacherAttendance" useGeneratedKeys="true"
@@ -74,7 +75,7 @@
         INSERT INTO teacher_attendance
         (group_type_,teacher_id_,music_group_id_,class_group_id_,course_schedule_id_,sign_in_time_,sign_in_status_,
         remark_,create_time_,sign_out_time_,sign_out_status_,sign_in_longitude_latitude_,sign_out_longitude_latitude_,current_schedule_id_,sign_out_attachments_,
-        sign_out_remark_,update_attendance_type_,url_,sign_in_device_no_,sign_out_device_no_)
+        sign_out_remark_,update_attendance_type_,url_,sign_in_device_no_,sign_out_device_no_,tenant_id_)
         VALUE
         <foreach collection="teacherAttendances" item="teacherAttendance" separator=",">
             (#{teacherAttendance.groupType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
@@ -86,7 +87,7 @@
             #{teacherAttendance.signInLongitudeLatitude},#{teacherAttendance.signOutLongitudeLatitude},#{teacherAttendance.currentScheduleId},
             #{teacherAttendance.signOutAttachments},#{teacherAttendance.signOutRemark},
             #{teacherAttendance.updateAttendanceEnum,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{teacherAttendance.url},
-            #{teacherAttendance.signInDeviceNo},#{teacherAttendance.signOutDeviceNo})
+            #{teacherAttendance.signInDeviceNo},#{teacherAttendance.signOutDeviceNo},#{teacherAttendance.tenantId})
         </foreach>
     </insert>
 
@@ -182,7 +183,7 @@
                 sign_out_device_no_ = #{signOutDeviceNo},
             </if>
         </set>
-        WHERE id_ = #{id}
+        WHERE id_ = #{id} and tenant_id_ = #{tenantId}
     </update>
 
     <!-- 根据主键删除一条记录 -->
@@ -207,13 +208,13 @@
 
     <!-- 分页查询 -->
     <select id="queryPage" resultMap="TeacherAttendance" parameterType="map">
-        SELECT * FROM teacher_attendance ORDER BY id_
+        SELECT * FROM teacher_attendance where tenant_id_ = #{tenantId} ORDER BY id_
         <include refid="global.limit"/>
     </select>
 
     <!-- 查询当前表的总记录数 -->
     <select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM teacher_attendance
+		SELECT COUNT(*) FROM teacher_attendance where tenant_id_ = #{tenantId}
 	</select>
 
     <resultMap id="teacherPersonalAttendance" type="com.ym.mec.biz.dal.dto.TeacherPersonalAttendanceDto">
@@ -254,7 +255,7 @@
 
     <sql id="queryCondition">
         <where>
-            (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL) AND cs.actual_teacher_id_ = ta.teacher_id_ AND cs.pre_course_flag_ = 0
+            (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL) AND cs.actual_teacher_id_ = ta.teacher_id_ AND cs.pre_course_flag_ = 0 and cs.tenant_id_ = #{tenantId}
             <if test="teacherId != null">
                 AND cs.actual_teacher_id_ = #{teacherId}
             </if>
@@ -286,7 +287,7 @@
     </sql>
     <sql id="queryTeacherAttendancesCondition">
         <where>
-            cs.del_flag_ = 0 AND cs.pre_course_flag_ = 0
+            cs.del_flag_ = 0 AND cs.pre_course_flag_ = 0 and cs.tenant_id_ = #{tenantId}
             AND (cs.new_course_id_ IS NULL OR cs.new_course_id_=cs.id_)
             <if test="search != null and search != ''">
                 AND (su.id_ = #{search} OR su.real_name_ LIKE CONCAT('%',#{search},'%') OR cs.id_ = #{search} OR cs.name_ LIKE CONCAT('%',#{search},'%'))
@@ -466,7 +467,7 @@
         SELECT ta.teacher_id_ key_,u.real_name_ value_,cs.id_ course_schedule_id_
         FROM course_schedule cs RIGHT JOIN teacher_attendance ta on ta.course_schedule_id_ = cs.id_
         LEFT JOIN sys_user u on ta.teacher_id_ = u.id_
-        WHERE ta.sign_out_status_ IS NULL
+        WHERE ta.sign_out_status_ IS NULL and cs.tenant_id_ = #{tenantId}
         AND (cs.new_course_id_ IS NULL OR cs.new_course_id_=cs.id_)
         AND CONCAT( cs.class_date_, ' ', cs.end_class_time_ ) &lt;= DATE_SUB(now(),INTERVAL #{minutes} MINUTE) AND cs.del_flag_ = 0
         AND cs.group_type_ = 'MUSIC'
@@ -572,7 +573,7 @@
     </select>
     <sql id="queryTeacherAttendanceComplaintsSql">
         <where>
-            ta.is_complaints_ = 1
+            ta.is_complaints_ = 1 and ta.tenant_id_ = #{tenantId}
             <if test="organId != null and organId != ''">
                 AND FIND_IN_SET(t.organ_id_, #{organId})
             </if>

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

@@ -19,12 +19,13 @@
         <result column="confirm_status_" property="confirmStatus" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="create_time_" jdbcType="TIMESTAMP" property="createTime"/>
         <result column="update_time_" jdbcType="TIMESTAMP" property="updateTime"/>
+        <result column="tenant_id_" property="tenantId"/>
     </resultMap>
     <sql id="Base_Column_List">
         <!--@mbg.generated-->
         id_, music_group_id_, group_type_, course_schedule_id_list_, course_group_name_,
         organ_id_, teacher_id_, expect_reward_amount_, actual_reward_amount_, memo_, create_time_,
-        update_time_,settlement_status_,settlement_date_
+        update_time_,settlement_status_,settlement_date_,tenant_id_
     </sql>
     <select id="get" parameterType="java.lang.Long" resultMap="teacherCourseReward">
         select *
@@ -41,12 +42,12 @@
         insert into teacher_course_reward (music_group_id_, group_type_, course_schedule_id_list_,
                                            course_group_name_, organ_id_, teacher_id_,
                                            expect_reward_amount_, actual_reward_amount_,
-                                           memo_, create_time_, update_time_)
+                                           memo_, create_time_, update_time_,tenant_id_)
         values (#{musicGroupId,jdbcType=VARCHAR}, #{groupType,jdbcType=VARCHAR},
                 #{courseScheduleIdList,jdbcType=VARCHAR},
                 #{courseGroupName,jdbcType=VARCHAR}, #{organId,jdbcType=INTEGER}, #{teacherId,jdbcType=INTEGER},
                 #{expectRewardAmount,jdbcType=DECIMAL}, #{actualRewardAmount,jdbcType=DECIMAL},
-                #{memo,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP})
+                #{memo,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP},#{tenantId})
     </insert>
     <update id="update" parameterType="com.ym.mec.biz.dal.entity.TeacherCourseReward">
         update teacher_course_reward
@@ -94,7 +95,7 @@
                 confirm_status_ = #{confirmStatus,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
             </if>
         </set>
-        where id_ = #{id,jdbcType=BIGINT}
+        where id_ = #{id,jdbcType=BIGINT} and tenant_id_ = #{tenantId}
     </update>
     <update id="batchUpdate">
         <foreach collection="teacherCourseRewards" item="item" index="index" open="" close="" separator=";">
@@ -119,12 +120,12 @@
                     settlement_status_ = #{item.settlementStatus,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
                 </if>
             </set>
-            where id_ = #{item.id,jdbcType=BIGINT}
+            where id_ = #{item.id,jdbcType=BIGINT} and tenant_id_ = #{tenantId}
         </foreach>
     </update>
     <update id="updateTeacherRewardConfirmStatusWithMonth">
         UPDATE teacher_course_reward SET confirm_status_ = #{confirmStatus,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
-        WHERE DATE_FORMAT( settlement_date_, '%Y-%m' ) = #{month}
+        WHERE DATE_FORMAT( settlement_date_, '%Y-%m' ) = #{month} and tenant_id_ = #{tenantId}
         <if test="teacherId!=null">
             AND teacher_id_=#{teacherId}
         </if>
@@ -135,6 +136,7 @@
 
     <sql id="queryCondition">
         <where>
+        	tcr.tenant_id_ = #{tenantId}
             <if test="teacherId != null">
                 AND tcr.teacher_id_=#{teacherId}
             </if>
@@ -171,9 +173,6 @@
         SELECT count(*) FROM teacher_course_reward tcr
         <include refid="queryCondition"/>
     </select>
-    <select id="findBySettlementStatus" resultMap="teacherCourseReward">
-        SELECT * FROM teacher_course_reward tcr WHERE tcr.settlement_status_ = #{settlementStatus}
-    </select>
 
     <select id="teacherCourseRewardStatWithMonth" resultMap="com.ym.mec.biz.dal.dao.CourseScheduleTeacherSalaryDao.CourseTeacherSalaryStatisticsDto">
         SELECT

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

@@ -22,6 +22,7 @@
         <result column="phone_" jdbcType="VARCHAR" property="phone"/>
         <result column="organ_name_" jdbcType="VARCHAR" property="organName"/>
         <result column="month_str_" jdbcType="VARCHAR" property="monthStr"/>
+        <result column="tenant_id_" property="tenantId"/>
         <association property="subjectList"
                      select="com.ym.mec.biz.dal.dao.SubjectDao.findBySubjectByIdList"
                         column="{subjectIdList = tcs.subject_id_list_}"/>
@@ -55,18 +56,18 @@
         subject_id_list_, vip_course_num_, music_course_num_, practice_course_num_,
         expect_music_course_salary_, expect_vip_course_salary_, expect_practice_course_salary_,
         expect_total_salary_, average_class_minutes_,
-        statistics_date_time_,low_salary)
+        statistics_date_time_,low_salary,tenant_id_)
         VALUES (#{id,jdbcType=BIGINT}, #{userId,jdbcType=INTEGER}, #{organId,jdbcType=INTEGER}, #{month,jdbcType=DATE},
         #{subjectIdList,jdbcType=VARCHAR}, #{vipCourseNum,jdbcType=INTEGER}, #{musicCourseNum,jdbcType=INTEGER}, #{practiceCourseNum},
         #{expectMusicCourseSalary,jdbcType=DECIMAL}, #{expectVipCourseSalary,jdbcType=DECIMAL}, #{expectPracticeCourseSalary},
-        #{expectTotalSalary,jdbcType=DECIMAL}, #{averageClassMinutes,jdbcType=INTEGER},NOW(),#{lowSalary})
+        #{expectTotalSalary,jdbcType=DECIMAL}, #{averageClassMinutes,jdbcType=INTEGER},NOW(),#{lowSalary},#{tenantId})
     </insert>
 
     <insert id="batchAdd" parameterType="java.util.List" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
         INSERT INTO teacher_course_statistics (id_, user_id_, organ_id_, month_,
         subject_id_list_, vip_course_num_, music_course_num_, practice_course_num_,
         expect_music_course_salary_, expect_vip_course_salary_, expect_practice_course_salary_,
-        expect_total_salary_, average_class_minutes_,statistics_date_time_,low_salary)
+        expect_total_salary_, average_class_minutes_,statistics_date_time_,low_salary,tenant_id_)
         VALUE
         <foreach collection="lists" item="list" separator=",">
         (#{list.id,jdbcType=BIGINT}, #{list.userId,jdbcType=INTEGER}, #{list.organId,jdbcType=INTEGER}, #{list.month,jdbcType=DATE},
@@ -74,7 +75,7 @@
             #{list.practiceCourseNum},
         #{list.expectMusicCourseSalary,jdbcType=DECIMAL}, #{list.expectVipCourseSalary,jdbcType=DECIMAL},
             #{list.expectPracticeCourseSalary},
-        #{list.expectTotalSalary,jdbcType=DECIMAL}, #{list.averageClassMinutes,jdbcType=INTEGER},NOW(),#{list.lowSalary})
+        #{list.expectTotalSalary,jdbcType=DECIMAL}, #{list.averageClassMinutes,jdbcType=INTEGER},NOW(),#{list.lowSalary},#{list.tenantId})
         </foreach>
     </insert>
 
@@ -101,7 +102,7 @@
             GROUP BY
                 csts.user_id_
         ) ctt ON ctt.user_id_=t.id_
-        WHERE su.del_flag_ != 1 AND su.lock_flag_!=1
+        WHERE su.del_flag_ != 1 AND su.lock_flag_!=1 and t.tenant_id_ = #{tenantId}
           AND t.demission_date_ IS NULL
           AND t.organ_id_ IS NOT NULL
         ]]>
@@ -138,7 +139,7 @@
 
     <sql id="queryParams">
         <where>
-            u.lock_flag_ = 0 AND u.del_flag_ = 0 AND t.job_nature_ = 'FULL_TIME' AND t.demission_date_ IS NULL
+            u.lock_flag_ = 0 AND u.del_flag_ = 0 AND t.job_nature_ = 'FULL_TIME' AND t.demission_date_ IS NULL and tcs.tenant_id_ = #{tenantId}
             <if test="organId != null">
                 AND FIND_IN_SET(tcs.organ_id_,#{organId})
             </if>

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

@@ -14,6 +14,7 @@
 		<result column="salary_rule_json_" property="salaryRuleJson" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
+        <result column="tenant_id_" property="tenantId"/>
 	</resultMap>
 
 	<!-- 根据主键查询一条记录 -->
@@ -24,7 +25,7 @@
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="TeacherDefaultMusicGroupSalary">
 		SELECT * FROM
-		teacher_default_music_group_salary ORDER BY id_
+		teacher_default_music_group_salary where tenant_id_ = #{tenantId} ORDER BY id_
 	</select>
 
 	<!-- 向数据库增加一条记录 -->
@@ -33,19 +34,19 @@
 		useGeneratedKeys="true" keyColumn="id" keyProperty="id">
 		INSERT INTO teacher_default_music_group_salary
 		(user_id_,course_schedule_type_,main_teacher_90min_salary_,assistant_teacher_90min_salary_,main_teacher_30min_salary_,
-		assistant_teacher_30min_salary_,salary_rule_json_,create_time_,update_time_)
+		assistant_teacher_30min_salary_,salary_rule_json_,create_time_,update_time_,tenant_id_)
 		VALUES(#{userId},#{courseScheduleType, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
 		#{mainTeacher90MinSalary},#{assistantTeacher90MinSalary},
-		#{mainTeacher30MinSalary},#{assistantTeacher30MinSalary},#{salaryRuleJson},now(),now())
+		#{mainTeacher30MinSalary},#{assistantTeacher30MinSalary},#{salaryRuleJson},now(),now(),#{tenantId})
 	</insert>
 	<insert id="batchAdd" parameterType="list">
 		INSERT INTO teacher_default_music_group_salary
 		(user_id_,course_schedule_type_,main_teacher_90min_salary_,assistant_teacher_90min_salary_,main_teacher_30min_salary_,
-		assistant_teacher_30min_salary_,salary_rule_json_,create_time_,update_time_)
+		assistant_teacher_30min_salary_,salary_rule_json_,create_time_,update_time_,tenant_id_)
 		VALUES
 		<foreach collection="salaries" item="item" separator=",">
 			(#{item.userId},#{item.courseScheduleType.code},#{item.mainTeacher90MinSalary},
-			#{item.assistantTeacher90MinSalary},#{item.mainTeacher30MinSalary},#{item.assistantTeacher30MinSalary},#{item.salaryRuleJson},now(),now())
+			#{item.assistantTeacher90MinSalary},#{item.mainTeacher30MinSalary},#{item.assistantTeacher30MinSalary},#{item.salaryRuleJson},now(),now(),#{item.tenantId})
 		</foreach>
 	</insert>
 
@@ -79,7 +80,7 @@
 				salary_rule_json_ = #{salaryRuleJson},
 			</if>
 		</set>
-		WHERE id_ = #{id}
+		WHERE id_ = #{id} and tenant_id_ = #{tenantId}
 	</update>
 
 	<!-- 根据主键删除一条记录 -->
@@ -99,6 +100,7 @@
 	</select>
 	<sql id="querySalary">
 		<where>
+			tdmgs.tenant_id_ = #{tenantId}
 			<if test="teacherId != null">
 				AND tdmgs.user_id_ = #{teacherId}
 			</if>

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

@@ -12,6 +12,7 @@
 		<result column="assistant_teacher_salary_" property="assistantTeacherSalary" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
+        <result column="tenant_id_" property="tenantId"/>
 	</resultMap>
 
 	<!-- 根据主键查询一条记录 -->
@@ -22,7 +23,7 @@
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="TeacherDefaultPracticeGroupSalary">
 		SELECT * FROM
-		teacher_default_practice_group_salary ORDER BY id_
+		teacher_default_practice_group_salary where tenant_id_ = #{tenantId} ORDER BY id_
 	</select>
 
 	<!-- 向数据库增加一条记录 -->
@@ -32,15 +33,15 @@
 		<!-- <selectKey resultClass="int" keyProperty="id" > SELECT SEQ_WSDEFINITION_ID.nextval 
 			AS ID FROM DUAL </selectKey> -->
 		INSERT INTO teacher_default_practice_group_salary
-		(id_,user_id_,minutes_,main_teacher_salary_,assistant_teacher_salary_,create_time_,update_time_)
-		VALUES(#{id},#{userId},#{minutes},#{mainTeacherSalary},#{assistantTeacherSalary},#{createTime},#{updateTime})
+		(id_,user_id_,minutes_,main_teacher_salary_,assistant_teacher_salary_,create_time_,update_time_,tenant_id_)
+		VALUES(#{id},#{userId},#{minutes},#{mainTeacherSalary},#{assistantTeacherSalary},#{createTime},#{updateTime},#{tenantId})
 	</insert>
 	
     <insert id="batchInsert">
     	INSERT INTO teacher_default_practice_group_salary
-		(id_,user_id_,minutes_,main_teacher_salary_,assistant_teacher_salary_,create_time_,update_time_)
+		(id_,user_id_,minutes_,main_teacher_salary_,assistant_teacher_salary_,create_time_,update_time_,tenant_id_)
 		<foreach collection="list" item="item" separator=",">
-			VALUES(#{item.id},#{item.userId},#{item.minutes},#{item.mainTeacherSalary},#{item.assistantTeacherSalary},now(),now())
+			VALUES(#{item.id},#{item.userId},#{item.minutes},#{item.mainTeacherSalary},#{item.assistantTeacherSalary},now(),now(),#{tenantId})
 		</foreach>
     </insert>
 
@@ -71,7 +72,7 @@
 				create_time_ = #{createTime},
 			</if>
 		</set>
-		WHERE id_ = #{id}
+		WHERE id_ = #{id} and tenant_id_ = #{tenantId}
 	</update>
 
 	<!-- 根据主键删除一条记录 -->
@@ -87,14 +88,14 @@
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="TeacherDefaultPracticeGroupSalary"
 		parameterType="map">
-		SELECT * FROM teacher_default_practice_group_salary ORDER BY id_
+		SELECT * FROM teacher_default_practice_group_salary where tenant_id_ = #{tenantId} ORDER BY id_
 		<include refid="global.limit" />
 	</select>
 
 	<!-- 查询当前表的总记录数 -->
 	<select id="queryCount" resultType="int">
 		SELECT COUNT(*) FROM
-		teacher_default_practice_group_salary
+		teacher_default_practice_group_salary where tenant_id_ = #{tenantId}
 	</select>
 
 	<select id="queryByUserId" resultMap="TeacherDefaultPracticeGroupSalary">

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

@@ -15,6 +15,7 @@
         <result column="offline_classes_salary_" property="offlineClassesSalary"/>
         <result column="create_time_" property="createTime"/>
         <result column="update_time_" property="updateTime"/>
+        <result column="tenant_id_" property="tenantId"/>
     </resultMap>
 
     <!-- 根据主键查询一条记录 -->
@@ -24,21 +25,21 @@
 
     <!-- 全查询 -->
     <select id="findAll" resultMap="TeacherDefaultVipGroupSalary">
-		SELECT * FROM teacher_default_vip_group_salary ORDER BY id_
+		SELECT * FROM teacher_default_vip_group_salary where tenant_id_ = #{tenantId} ORDER BY id_
 	</select>
 
     <!-- 向数据库增加一条记录 -->
     <insert id="insert" parameterType="com.ym.mec.biz.dal.entity.TeacherDefaultVipGroupSalary" useGeneratedKeys="true"
             keyColumn="id" keyProperty="id">
         INSERT INTO teacher_default_vip_group_salary
-        (user_id_,vip_group_category_id_,offline_classes_salary_,create_time_,update_time_)
-        VALUES(#{userId},#{vipGroupCategoryId},#{offlineClassesSalary},now(),now())
+        (user_id_,vip_group_category_id_,offline_classes_salary_,create_time_,update_time_,tenant_id_)
+        VALUES(#{userId},#{vipGroupCategoryId},#{offlineClassesSalary},now(),now(),#{tenantId})
     </insert>
     <insert id="batchAdd">
         INSERT INTO teacher_default_vip_group_salary
-        (user_id_,vip_group_category_id_,offline_classes_salary_,create_time_,update_time_)VALUES
+        (user_id_,vip_group_category_id_,offline_classes_salary_,create_time_,update_time_,tenant_id_)VALUES
         <foreach collection="vipGroupSalaries" item="item" separator=",">
-            (#{item.userId},#{item.vipGroupCategoryId},#{item.offlineClassesSalary},now(),now())
+            (#{item.userId},#{item.vipGroupCategoryId},#{item.offlineClassesSalary},now(),now(),#{item.tenantId})
         </foreach>
     </insert>
 
@@ -59,7 +60,7 @@
                 vip_group_category_id_ = #{vipGroupCategoryId},
             </if>
         </set>
-        WHERE id_ = #{id}
+        WHERE id_ = #{id} and tenant_id_ = #{tenantId}
     </update>
 
     <!-- 根据主键删除一条记录 -->
@@ -81,8 +82,9 @@
         SELECT tdvgs.*,vgc.name_ vip_group_category_name_,vgc.music_theory_ FROM teacher_default_vip_group_salary tdvgs
         LEFT JOIN  vip_group_category vgc ON tdvgs.vip_group_category_id_ = vgc.id_
         <where>
+        	tdvgs.tenant_id_ = #{tenantId}
             <if test="search != null and search != ''">
-                tdvgs.user_id_ = #{search}
+                and tdvgs.user_id_ = #{search}
             </if>
         </where>
         ORDER BY tdvgs.id_
@@ -93,8 +95,9 @@
     <select id="queryCount" resultType="int">
 		SELECT COUNT(tdvgs.id_) FROM teacher_default_vip_group_salary tdvgs
         <where>
+        	tdvgs.tenant_id_ = #{tenantId}
             <if test="search != null and search != ''">
-                tdvgs.user_id_ = #{search}
+                and tdvgs.user_id_ = #{search}
             </if>
         </where>
 	</select>

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

@@ -18,6 +18,7 @@
 		<result column="total_times_" property="totalTimes" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
+        <result column="tenant_id_" property="tenantId"/>
 	</resultMap>
 
 	<!-- 根据主键查询一条记录 -->
@@ -28,7 +29,7 @@
 
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="TeacherFreeTime">
-		SELECT * FROM teacher_free_time
+		SELECT * FROM teacher_free_time where tenant_id_ = #{tenantId}
 		ORDER BY id_
 	</select>
 
@@ -38,8 +39,8 @@
 		<!-- <selectKey resultClass="int" keyProperty="id" > SELECT SEQ_WSDEFINITION_ID.nextval 
 			AS ID FROM DUAL </selectKey> -->
 		INSERT INTO teacher_free_time
-		(id_,user_id_,monday_,tuesday_,wednesday_,thursday_,friday_,saturday_,sunday_,holiday_,total_times_,create_time_,update_time_)
-		VALUES(#{id},#{userId},#{monday},#{tuesday},#{wednesday},#{thursday},#{friday},#{saturday},#{sunday},#{holiday},#{totalTimes},NOW(),NOW())
+		(id_,user_id_,monday_,tuesday_,wednesday_,thursday_,friday_,saturday_,sunday_,holiday_,total_times_,create_time_,update_time_,tenant_id_)
+		VALUES(#{id},#{userId},#{monday},#{tuesday},#{wednesday},#{thursday},#{friday},#{saturday},#{sunday},#{holiday},#{totalTimes},NOW(),NOW(),#{tenantId})
 	</insert>
 
 	<!-- 根据主键查询一条记录 -->
@@ -48,7 +49,7 @@
 		monday_ = #{monday},thursday_ = #{thursday},holiday_ = #{holiday},update_time_ = #{updateTime},
 		saturday_ = #{saturday},wednesday_ = #{wednesday},friday_ = #{friday},tuesday_ = #{tuesday},
 		sunday_ = #{sunday},total_times_ = #{totalTimes}
-		WHERE id_ = #{id}
+		WHERE id_ = #{id} and tenant_id_ = #{tenantId}
 	</update>
 
 	<!-- 根据主键删除一条记录 -->
@@ -59,14 +60,14 @@
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="TeacherFreeTime"
 		parameterType="map">
-		SELECT * FROM teacher_free_time ORDER BY id_
+		SELECT * FROM teacher_free_time  where tenant_id_ = #{tenantId} ORDER BY id_
 		<include refid="global.limit" />
 	</select>
 
 	<!-- 查询当前表的总记录数 -->
 	<select id="queryCount" resultType="int">
 		SELECT COUNT(*) FROM
-		teacher_free_time
+		teacher_free_time where tenant_id_ = #{tenantId}
 	</select>
 	<select id="findTeacherFreeTime" resultMap="TeacherFreeTime">
 		SELECT * FROM teacher_free_time WHERE user_id_ = #{userId} FOR UPDATE

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

@@ -19,6 +19,7 @@
 		<result column="courses_schedule_json_" property="coursesScheduleJson" />
 		<result column="wf_process_id_" property="wfProcessId" />
 		<result column="wf_order_id_" property="wfOrderId" />
+        <result column="tenant_id_" property="tenantId"/>
 	</resultMap>
 
 	<!-- 根据主键查询一条记录 -->
@@ -30,7 +31,7 @@
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="TeacherLeaveRecord">
 		SELECT * FROM
-		teacher_leave_record ORDER BY id_
+		teacher_leave_record where tenant_id_ = #{tenantId} ORDER BY id_
 	</select>
 
 	<!-- 向数据库增加一条记录 -->
@@ -39,8 +40,8 @@
 		<!-- <selectKey resultClass="int" keyProperty="id" > SELECT SEQ_WSDEFINITION_ID.nextval 
 			AS ID FROM DUAL </selectKey> -->
 		INSERT INTO teacher_leave_record
-		(id_,user_id_,days_,leave_category_id_,status_,remark_,create_time_,update_time_,start_time_,end_time_,courses_schedule_json_,wf_process_id_,wf_order_id_)
-		VALUES(#{id},#{userId},#{days},#{leaveCategoryId},#{status, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{remark},#{createTime},NOW(),#{startTime},#{endTime},#{coursesScheduleJson},#{wfProcessId},#{wfOrderId})
+		(id_,user_id_,days_,leave_category_id_,status_,remark_,create_time_,update_time_,start_time_,end_time_,courses_schedule_json_,wf_process_id_,wf_order_id_,tenant_id_)
+		VALUES(#{id},#{userId},#{days},#{leaveCategoryId},#{status, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{remark},#{createTime},NOW(),#{startTime},#{endTime},#{coursesScheduleJson},#{wfProcessId},#{wfOrderId},#{tenantId})
 	</insert>
 
 	<!-- 根据主键查询一条记录 -->
@@ -87,7 +88,7 @@
 				leave_category_id_ = #{leaveCategoryId},
 			</if>
 		</set>
-		WHERE id_ = #{id}
+		WHERE id_ = #{id} and tenant_id_ = #{tenantId}
 	</update>
 
 	<!-- 根据主键删除一条记录 -->
@@ -117,6 +118,7 @@
 
 	<sql id="queryLeavePage">
 		<where>
+			tlr.tenant_id_ = #{tenantId}
 			<if test="startTime != null and startTime != ''">
 				AND tlr.create_time_ &gt;= #{startTime}
 			</if>

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

@@ -129,7 +129,7 @@
     <!-- 全查询 -->
     <select id="findAll" resultMap="Teacher">
         SELECT *
-        FROM teacher
+        FROM teacher where tenant_id_ = #{tenantId}
         ORDER BY id_
     </select>
     
@@ -141,16 +141,16 @@
     <insert id="insert" parameterType="com.ym.mec.biz.dal.entity.Teacher" useGeneratedKeys="true" keyColumn="id"
             keyProperty="id">
         INSERT INTO teacher
-        (id_,organ_id_,job_type_,job_nature_,is_probation_period_,education_background_,graduate_school_,technical_titles_,work_unit_,subject_id_,entry_date_,demission_date_,formal_staff_date_,certificate_type_,certificate_num_,flow_organ_range_,introduction_,update_time_,create_time_,is_support_course_schedule_rewards_rules_,idcard_front_img_,idcard_back_img_,idcard_hand_img_,memo_,is_settlement_salary_)
-        VALUES(#{id},#{organId},#{jobType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{jobNature},#{isProbationPeriod,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{educationBackground},#{graduateSchool},#{technicalTitles},#{workUnit},#{subjectId},#{entryDate},#{demissionDate},#{formalStaffDate},#{certificateType},#{certificateNum},#{flowOrganRange},#{introduction},now(),now(),#{isSupportCourseScheduleRewardsRules},#{idcardFrontImg},#{idcardBackImg},#{idcardHandImg},#{memo},#{isSettlementSalary})
+        (id_,organ_id_,job_type_,job_nature_,is_probation_period_,education_background_,graduate_school_,technical_titles_,work_unit_,subject_id_,entry_date_,demission_date_,formal_staff_date_,certificate_type_,certificate_num_,flow_organ_range_,introduction_,update_time_,create_time_,is_support_course_schedule_rewards_rules_,idcard_front_img_,idcard_back_img_,idcard_hand_img_,memo_,is_settlement_salary_,tenant_id_)
+        VALUES(#{id},#{organId},#{jobType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{jobNature},#{isProbationPeriod,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{educationBackground},#{graduateSchool},#{technicalTitles},#{workUnit},#{subjectId},#{entryDate},#{demissionDate},#{formalStaffDate},#{certificateType},#{certificateNum},#{flowOrganRange},#{introduction},now(),now(),#{isSupportCourseScheduleRewardsRules},#{idcardFrontImg},#{idcardBackImg},#{idcardHandImg},#{memo},#{isSettlementSalary},#{tenantId})
     </insert>
 
     <insert id="addSysUser" parameterType="com.ym.mec.auth.api.entity.SysUser" useGeneratedKeys="true" keyColumn="id"
             keyProperty="id">
         INSERT INTO sys_user
-        (tenant_id_,im_token_,id_,username_,salt_,phone_,avatar_,organ_id_,create_time_,update_time_,wx_openid_,qq_openid_,user_type_,gender_,nation_,birthdate_,email_,id_card_no_,wechat_id_,real_name_,password_)
+        (tenant_id_,im_token_,id_,username_,salt_,phone_,avatar_,organ_id_,create_time_,update_time_,wx_openid_,qq_openid_,user_type_,gender_,nation_,birthdate_,email_,id_card_no_,wechat_id_,real_name_,password_,tenant_id_)
         VALUES(#{tenantId},#{imToken},#{id},#{username},#{salt},#{phone},#{avatar},#{organId},now(),now(),#{wxOpenid},#{qqOpenid},#{userType},
-        #{gender},#{nation},#{birthdate},#{email},#{idCardNo},#{wechatId},#{realName},#{password})
+        #{gender},#{nation},#{birthdate},#{email},#{idCardNo},#{wechatId},#{realName},#{password},#{tenantId})
     </insert>
 
     <!-- 根据主键查询一条记录 -->
@@ -224,7 +224,7 @@
                 is_settlement_salary_ = #{isSettlementSalary},
             </if>
         </set>
-        WHERE id_ = #{id}
+        WHERE id_ = #{id} and tenant_id_ = #{tenantId}
     </update>
 
     <!-- 根据主键查询一条记录 -->
@@ -301,7 +301,7 @@
                 is_settlement_salary_ = #{isSettlementSalary},
             </if>
         </set>
-        WHERE id_ = #{id}
+        WHERE id_ = #{id} and tenant_id_ = #{tenantId}
     </update>
 
     <!-- 根据主键删除一条记录 -->
@@ -367,7 +367,7 @@
                 im_token_ = #{imToken},
             </if>
         </set>
-        WHERE id_ = #{id}
+        WHERE id_ = #{id} and tenant_id_ = #{tenantId}
     </update>
 
     <!-- 分页查询 -->
@@ -391,7 +391,7 @@
 
     <sql id="queryPageMap">
         <where>
-            su.del_flag_ = 0
+            su.del_flag_ = 0 and t.tenant_id_ = #{tenantId}
             <if test="organId != null and organId != ''">
                AND (CONCAT(',',t.organ_id_,',',IFNULL(t.flow_organ_range_,''),',') REGEXP CONCAT(',(',replace(#{organId},',','|'),'),'))
             </if>
@@ -502,6 +502,7 @@
         SELECT su.id_ userId,su.real_name_ userName FROM sys_user su
         LEFT JOIN teacher t ON su.id_=t.id_
         <where>
+        	t.tenant_id_ = #{tenantId}
             <if test="userIds != null">
                 su.id_ IN
                 <foreach collection="userIds" separator="," open="(" close=")" item="item">
@@ -520,12 +521,10 @@
             su.phone_ phone
         FROM sys_user su
         <where>
-            <if test="userIds != null">
                 su.id_ IN
                 <foreach collection="userIds" separator="," open="(" close=")" item="item">
                     #{item}
                 </foreach>
-            </if>
         </where>
     </select>
 
@@ -739,6 +738,7 @@
         <include refid="queryMusicGroupTeachersSql"/>
     </select>
     <sql id="queryMusicGroupTeachersSql">
+    	t.tenant_id_ = #{tenantId}
         <if test="search != null and search != ''">
             AND (su.real_name_ LIKE CONCAT('%',#{search},'%') OR su.phone_ LIKE CONCAT('%',#{search},'%') OR
             su.id_=#{search})
@@ -759,7 +759,7 @@
 
     <sql id="queryTeacherAttendanceSql">
         <where>
-            CONCAT(cs.class_date_,' ',cs.start_class_time_) &lt; NOW() AND cgtm.teacher_role_ = 'BISHOP'
+            CONCAT(cs.class_date_,' ',cs.start_class_time_) &lt; NOW() AND cgtm.teacher_role_ = 'BISHOP' and cs.tenant_id_ = #{tenantId}
             <if test="startTime != null and startTime != ''">
                 AND cs.class_date_ &gt;= #{startTime}
             </if>
@@ -860,14 +860,12 @@
     <select id="findOrganTeacherBySubject" resultMap="Teacher">
         SELECT su.* FROM teacher t
         LEFT JOIN sys_user su on t.id_ = su.id_ WHERE 1=1
-        <if test="subjectId != null">
             AND FIND_IN_SET(#{subjectId},t.subject_id_)
-        </if>
     </select>
 
     <sql id="queryCloses">
         <where>
-            CONCAT(cs.class_date_,' ',cs.start_class_time_) &lt; NOW()
+            CONCAT(cs.class_date_,' ',cs.start_class_time_) &lt; NOW() and cs.tenant_id_ = #{tenantId}
             <if test="teacherId != null">
                 AND csts.user_id_ = #{teacherId}
             </if>
@@ -902,17 +900,13 @@
         select count(*) total,sum(case when job_nature_ = 'PART_TIME' then 1 else 0 end) part_time_num_,sum(case when
         job_nature_ = 'FULL_TIME' then 1 else 0 end) full_time_num_ from teacher
         where demission_date_ is null and organ_id_ not in (36,38)
-            <if test="organId != null">
                 and FIND_IN_SET(organ_id_,#{organId})
-            </if>
     </select>
     <select id="findByFlowOrganRangeTeachers" resultMap="TeacherBasicDto">
         SELECT su.id_,su.username_,su.real_name_,t.organ_id_ FROM teacher t
         LEFT JOIN sys_user su ON t.id_ = su.id_
         WHERE su.del_flag_ = 0 AND su.lock_flag_=0
-        <if test="organId != null and organId != ''">
             AND (INTE_ARRAY(#{organId},t.flow_organ_range_) OR FIND_IN_SET(t.organ_id_,#{organId}))
-        </if>
     </select>
 
     <select id="findByTeacherIds" resultMap="Teacher">
@@ -927,9 +921,7 @@
         SELECT su.id_,su.username_,su.real_name_ FROM teacher t
         LEFT JOIN sys_user su ON t.id_ = su.id_
         WHERE su.del_flag_ != 1 AND su.lock_flag_!=1
-        <if test="organId != null">
             AND (FIND_IN_SET(t.organ_id_,#{organId}) OR INTE_ARRAY(t.flow_organ_range_,#{organId}))
-        </if>
         <if test="subjectIds != null">
             AND INTE_ARRAY(t.subject_id_,#{subjectIds})
         </if>
@@ -944,17 +936,6 @@
             #{item}
         </foreach>
     </select>
-    <select id="searchTeachers" resultMap="TeacherBasicDto">
-        SELECT su.id_,su.username_,su.real_name_ FROM teacher t
-        LEFT JOIN sys_user su ON t.id_ = su.id_
-        WHERE su.del_flag_ != 1 AND su.lock_flag_!=1
-        <if test="organId != null">
-            AND FIND_IN_SET(t.organ_id_,#{organId})
-        </if>
-        <if test="teacherName != null">
-            AND su.real_name_ LIKE CONCAT('%',#{teacherName},'%')
-        </if>
-    </select>
     <select id="countTeacherName" resultType="java.lang.Integer">
         SELECT COUNT(su.id_) FROM teacher t
         LEFT JOIN sys_user su ON t.id_ = su.id_
@@ -962,6 +943,7 @@
         <include refid="queryPageNameSql"/>
     </select>
     <sql id="queryPageNameSql">
+    	t.tenant_id_ = #{tenantId}
         <if test="organId != null and includeFlowOrgan==null">
             AND FIND_IN_SET(t.organ_id_,#{organId})
         </if>
@@ -1365,6 +1347,7 @@
 		LEFT JOIN teacher_default_practice_group_salary pgs ON pgs.user_id_ = t.id_
 		LEFT JOIN teacher_default_music_group_salary mgs ON mgs.user_id_ = t.id_
 		<where>
+			t.tenant_id_ = #{tenantId}
 			<if test="organIdList != null">
                 AND find_in_set(t.organ_id_,#{organIdList})
             </if>
@@ -1383,13 +1366,10 @@
         SELECT GROUP_CONCAT(real_name_) FROM sys_user su
         WHERE FIND_IN_SET(su.id_,#{teachingTeacherIds})
     </select>
-    <select id="queryAllIds" resultType="java.lang.Integer">
-        SELECT id_ FROM sys_user
-    </select>
 
     <sql id="queryTeacherMusicIdsCondition">
         <where>
-            cs.del_flag_=0 AND csts.group_type_='MUSIC' AND mg.del_flag_=0 AND mg.status_='PROGRESS'
+            cs.del_flag_=0 AND csts.group_type_='MUSIC' AND mg.del_flag_=0 AND mg.status_='PROGRESS' and csts.tenant_id_ = #{tenantId}
             <if test="teacherId!=null">
                 AND csts.user_id_=#{teacherId}
             </if>
@@ -1420,7 +1400,7 @@
 
     <sql id="queryMemberStudentDataCondition">
         <where>
-            su.del_flag_=0 AND su.lock_flag_=0
+            su.del_flag_=0 AND su.lock_flag_=0 and tea.tenant_id_ = #{tenantId}
             <if test="organId!=null and organId!=''">
                 AND tea.organ_id_ = #{organId}
             </if>

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

@@ -15,6 +15,7 @@
 		<result column="content_" property="content" />
 		<result column="type_" property="type" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
 		<result column="create_time_" property="createTime" />
+        <result column="tenant_id_" property="tenantId"/>
 	</resultMap>
 
 	<!-- 根据主键查询一条记录 -->
@@ -24,7 +25,7 @@
 
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="TeacherRemind">
-		SELECT * FROM teacher_remind ORDER BY id_
+		SELECT * FROM teacher_remind where tenant_id_ = #{tenantId} ORDER BY id_
 	</select>
 
 	<!-- 向数据库增加一条记录 -->
@@ -34,15 +35,15 @@
 		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
 		</selectKey>
 		-->
-		INSERT INTO teacher_remind (operator_id_,operator_name_,teacher_id_,monday_,content_,type_,create_time_)
-		VALUES(#{operatorId},#{operatorName},#{teacherId},#{monday},#{content},#{type, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},NOW())
+		INSERT INTO teacher_remind (operator_id_,operator_name_,teacher_id_,monday_,content_,type_,create_time_,tenant_id_)
+		VALUES(#{operatorId},#{operatorName},#{teacherId},#{monday},#{content},#{type, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},NOW(),#{tenantId})
 	</insert>
 
 	<insert id="batchInsert" parameterType="com.ym.mec.biz.dal.entity.TeacherRemind" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		INSERT INTO teacher_remind (operator_id_,operator_name_,teacher_id_,monday_,content_,type_,create_time_)
+		INSERT INTO teacher_remind (operator_id_,operator_name_,teacher_id_,monday_,content_,type_,create_time_,tenant_id_)
 		VALUE
 		<foreach collection="reminds" item="remind" separator=",">
-			(#{remind.operatorId},#{remind.operatorName},#{remind.teacherId},#{remind.monday},#{remind.content},#{remind.type, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},NOW())
+			(#{remind.operatorId},#{remind.operatorName},#{remind.teacherId},#{remind.monday},#{remind.content},#{remind.type, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},NOW(),#{tenantId})
 		</foreach>
 	</insert>
 
@@ -70,7 +71,7 @@
 		<if test="type != null">
 			type_ = #{type, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
 		</if>
-	</set> WHERE id_ = #{id}
+	</set> WHERE id_ = #{id} and tenant_id_ = #{tenantId}
 	</update>
 
 	<!-- 根据主键删除一条记录 -->
@@ -80,12 +81,12 @@
 
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="TeacherRemind" parameterType="map">
-		SELECT * FROM teacher_remind ORDER BY id_ <include refid="global.limit"/>
+		SELECT * FROM teacher_remind where tenant_id_ = #{tenantId} ORDER BY id_ <include refid="global.limit"/>
 	</select>
 
 	<!-- 查询当前表的总记录数 -->
 	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM teacher_remind
+		SELECT COUNT(*) FROM teacher_remind where tenant_id_ = #{tenantId}
 	</select>
 
 	<select id="findTeachersRemindWithType" resultMap="TeacherRemind">

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

@@ -17,14 +17,15 @@
 		<result column="handing_suggestion_" property="handingSuggestion" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
+        <result column="tenant_id_" property="tenantId"/>
 	</resultMap>
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.TeacherSalaryComplaints"
 			useGeneratedKeys="true" keyColumn="id" keyProperty="id">
 		INSERT INTO teacher_salary_complaints
-		(teacher_id_,salary_settlement_month_,reason_,status_,operator_id_,handing_suggestion_,create_time_,update_time_)
+		(teacher_id_,salary_settlement_month_,reason_,status_,operator_id_,handing_suggestion_,create_time_,update_time_,tenant_id_)
 		VALUES(#{teacherId},#{salarySettlementMonth},#{reason},#{statusEnum, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-		#{operatorId},#{handingSuggestion},NOW(),NOW())
+		#{operatorId},#{handingSuggestion},NOW(),NOW(),#{tenantId})
 	</insert>
 
 	<!-- 根据主键查询一条记录 -->
@@ -53,7 +54,7 @@
 				update_time_ = NOW()
 			</if>
 		</set>
-		WHERE id_ = #{id}
+		WHERE id_ = #{id} and tenant_id_ = #{tenantId}
 	</update>
 	<update id="repealComplaints">
 		UPDATE teacher_salary_complaints tsc SET tsc.status_ = 'WITHDRAWN'
@@ -64,7 +65,7 @@
     <update id="updateComplaintStatusTuDoneWithMonth">
 		UPDATE teacher_salary_complaints tsc SET tsc.status_ = 'DONE'
 		WHERE tsc.salary_settlement_month_ = #{month}
-		AND tsc.status_ = 'PENDING'
+		AND tsc.status_ = 'PENDING' and tsc.tenant_id_ = #{tenantId}
 	</update>
 
     <!-- 根据主键查询一条记录 -->
@@ -75,7 +76,7 @@
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="TeacherSalaryComplaints">
 		SELECT * FROM
-		teacher_salary_complaints ORDER BY id_
+		teacher_salary_complaints where tenant_id_ = #{tenantId} ORDER BY id_
 	</select>
 
 	<!-- 根据主键删除一条记录 -->
@@ -99,8 +100,9 @@
 
 	<sql id="queryPageSql">
 		<where>
+			tsc.tenant_id_ = #{tenantId}
 			<if test="organId != null and organId != ''">
-				FIND_IN_SET(t.organ_id_,#{organId})
+				and FIND_IN_SET(t.organ_id_,#{organId})
 			</if>
 			<if test="salarySettlementMonth != null and salarySettlementMonth != ''">
 				AND tsc.salary_settlement_month_ = #{salarySettlementMonth}

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

@@ -17,6 +17,7 @@
         <result column="memo_" property="memo"/>
         <result column="operator_id_" property="operatorId"/>
         <result column="create_time_" property="createTime"/>
+        <result column="tenant_id_" property="tenantId"/>
     </resultMap>
 
     <!-- 根据主键查询一条记录 -->
@@ -26,13 +27,13 @@
 
     <!-- 全查询 -->
     <select id="findAll" resultMap="TeacherSalaryModifyLog">
-		SELECT * FROM teacher_salary_modify_log ORDER BY id_
+		SELECT * FROM teacher_salary_modify_log where tenant_id_ = #{tenantId} ORDER BY id_
 	</select>
 
     <!-- 向数据库增加一条记录 -->
     <insert id="insert" parameterType="com.ym.mec.biz.dal.entity.TeacherSalaryModifyLog" useGeneratedKeys="true" keyColumn="id"
             keyProperty="id">
-        INSERT INTO teacher_salary_modify_log (teacher_id_,course_schedule_id_,pre_expect_salary_,pre_reduce_salary_,current_expect_salary_,current_reduce_salary_,memo_,operator_id_,create_time_)
-        VALUES(#{teacherId},#{courseScheduleId},#{preExpectSalary},#{preReduceSalary},#{currentExpectSalary},#{currentReduceSalary},#{memo},#{operatorId},NOW())
+        INSERT INTO teacher_salary_modify_log (teacher_id_,course_schedule_id_,pre_expect_salary_,pre_reduce_salary_,current_expect_salary_,current_reduce_salary_,memo_,operator_id_,create_time_,tenant_id_)
+        VALUES(#{teacherId},#{courseScheduleId},#{preExpectSalary},#{preReduceSalary},#{currentExpectSalary},#{currentReduceSalary},#{memo},#{operatorId},NOW(),#{tenantId})
     </insert>
 </mapper>

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

@@ -54,6 +54,7 @@
 		<result property="code" column="code_"/>
 		<result property="activityChannel" column="activity_channel_"/>
 		<result property="originalPrice" column="original_price_"/>
+        <result column="tenant_id_" property="tenantId"/>
 	</resultMap>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -63,7 +64,7 @@
 	
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="VipGroupActivity">
-		SELECT * FROM vip_group_activity WHERE del_flag_=0 ORDER BY id_
+		SELECT * FROM vip_group_activity WHERE del_flag_=0 and tenant_id_ = #{tenantId} ORDER BY id_
 	</select>
 	
 	<!-- 向数据库增加一条记录 -->
@@ -75,14 +76,14 @@
 										single_course_time_,discount_,full_minus_course_times_,give_course_type_,give_category_id_,give_course_num_
 										,member_rank_id_,member_time_,give_member_rank_id_,give_member_time_,course_type_,
 		                                activity_type_,give_sign_course_time_,is_pay_to_balance_,teach_mode_,give_teach_mode_,
-		                                period_,give_period_,status_,market_price_,give_allow_online_to_offline_,give_prize_num_,activity_channel_,original_price_)
+		                                period_,give_period_,status_,market_price_,give_allow_online_to_offline_,give_prize_num_,activity_channel_,original_price_,tenant_id_)
 		VALUES(#{name},#{description},#{vipGroupCategoryIdList},#{startTime},#{endTime},#{organId},#{coursesStartTime},#{coursesEndTime},
 		       now(),now(),#{salarySettlementJson},#{delFlag},#{onlineClassJoinGradientRewards},
 		       #{offlineClassJoinGradientRewards},#{minCourseNum},#{maxCourseNum},#{studentMaxUsedTimes},#{applyToStudentType},#{allowOnlineToOffline},
 			   #{singleCourseTime},#{discount},#{fullMinusCourseTimes},#{giveCourseType},#{giveCategoryId},#{giveCourseNum}
 				  ,#{memberRankId},#{memberTime},#{giveMemberRankId},#{giveMemberTime},#{courseType},#{activityType},#{giveSingleCourseTime},
 		       #{isPayToBalance},#{teachMode},#{giveTeachMode},#{periodEnum},#{givePeriodEnum},#{status},
-		       #{marketPrice},#{giveAllowOnlineToOffline},#{givePrizeNum},#{activityChannel},#{originalPrice})
+		       #{marketPrice},#{giveAllowOnlineToOffline},#{givePrizeNum},#{activityChannel},#{originalPrice},#{tenantId})
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -103,7 +104,7 @@
 		max_course_num_=#{maxCourseNum},student_max_used_times_=#{studentMaxUsedTimes},apply_to_student_type_=#{applyToStudentType},
 		allow_online_to_offline_=#{allowOnlineToOffline},end_time_ = #{endTime},market_price_ = #{marketPrice},update_time_ = NOW(),
 		give_allow_online_to_offline_ = #{giveAllowOnlineToOffline},
-		give_prize_num_ = #{givePrizeNum},activity_channel_ = #{activityChannel},original_price_ = #{originalPrice} WHERE id_ = #{id}
+		give_prize_num_ = #{givePrizeNum},activity_channel_ = #{activityChannel},original_price_ = #{originalPrice} WHERE id_ = #{id} and tenant_id_ = #{tenantId}
 	</update>
 
 	<!-- 根据主键删除一条记录 -->
@@ -113,7 +114,7 @@
 
 	<sql id="queryCondition">
 		<where>
-			vga.del_flag_ = 0
+			vga.del_flag_ = 0 and vga.tenant_id_ = #{tenantId}
 			<if test="activityChannel != null">
 				AND vga.activity_channel_ = #{activityChannel}
 			</if>
@@ -264,7 +265,7 @@
 		LEFT JOIN `organization` o on find_in_set(o.`id_`,vga.`organ_id_` )
 		LEFT JOIN `vip_group_category` vgc on find_in_set(vgc.`id_`,vga.`vip_group_category_id_list_` )
 		<where>
-			vga.del_flag_=0
+			vga.del_flag_=0 and vga.tenant_id_ = #{tenantId}
 			<if test="organId != null">
 				AND INTE_ARRAY(vga.organ_id_,#{organId})
 			</if>
@@ -282,7 +283,7 @@
 	</select>
 
     <select id="findByName" resultMap="VipGroupActivity">
-		SELECT * FROM vip_group_activity vga WHERE vga.name_ = #{name}
+		SELECT * FROM vip_group_activity vga WHERE vga.name_ = #{name} and vga.tenant_id_ = #{tenantId}
 	</select>
 	<resultMap id="WaitCourseActivityDto" type="com.ym.mec.biz.dal.dto.WaitCourseActivityDto">
 		<result property="activityId" column="activity_id_"/>
@@ -292,7 +293,7 @@
 	<select id="queryWaitCourseActivity" resultMap="WaitCourseActivityDto">
 		SELECT aum.id_,aum.activity_id_,vga.name_ activity_name_,COUNT(DISTINCT aum.user_id_) student_num_ FROM activity_user_mapper aum
 		LEFT JOIN vip_group_activity vga ON aum.activity_id_ = vga.id_
-		WHERE aum.return_fee_ = 0
+		WHERE aum.return_fee_ = 0 and aum.tenant_id_ = #{tenantId}
 		<if test="teacherId != null">
 			AND aum.teacher_id_ = #{teacherId}
 		</if>
@@ -455,7 +456,7 @@
 		<result property="type" column="type_"/>
 	</resultMap>
 	<sql id="queryDoubleEleven2021OrderDetailSql">
-		WHERE spo.status_ = 'SUCCESS' AND spo.type_ = 'DOUBLE_ELEVEN2021'
+		WHERE spo.status_ = 'SUCCESS' AND spo.type_ = 'DOUBLE_ELEVEN2021' and spo.tenant_id_ = #{tenantId}
 		<if test="search != null and search != ''">
 			AND su.id_ = #{search} OR su.username_ LIKE CONCAT('%',#{search},'%') OR spo.order_no_ LIKE CONCAT('%',#{search},'%')
 		</if>

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

@@ -15,6 +15,7 @@
 		<result column="music_theory_" property="musicTheory" />
 		<result column="online_classes_unit_price_" property="onlineClassesUnitPrice" />
 		<result column="offline_classes_unit_price_" property="offlineClassesUnitPrice" />
+        <result column="tenant_id_" property="tenantId"/>
 	</resultMap>
 
 	<!-- 根据主键查询一条记录 -->
@@ -26,7 +27,7 @@
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="VipGroupCategory">
 		SELECT vgc.* FROM vip_group_category vgc
-		WHERE vgc.del_flag_!= 1
+		WHERE vgc.del_flag_!= 1 and tenant_id_ = #{tenantId}
 		ORDER BY id_
 	</select>
 
@@ -55,8 +56,8 @@
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.VipGroupCategory"
 		useGeneratedKeys="true" keyColumn="id" keyProperty="id">
 		INSERT INTO vip_group_category
-		(id_,name_,del_flag_,create_time_,update_time_,single_class_minutes_,student_num_,music_theory_)
-		VALUES(#{id},#{name},#{delFlag},#{createTime},NOW(),#{singleClassMinutes},#{studentNum},#{musicTheory})
+		(id_,name_,del_flag_,create_time_,update_time_,single_class_minutes_,student_num_,music_theory_,tenant_id_)
+		VALUES(#{id},#{name},#{delFlag},#{createTime},NOW(),#{singleClassMinutes},#{studentNum},#{musicTheory},#{tenantId})
 	</insert>
 
 	<!-- 根据主键查询一条记录 -->
@@ -86,7 +87,7 @@
 			</if>
 				update_time_ = NOW(),
 		</set>
-		WHERE id_ = #{id}
+		WHERE id_ = #{id} and tenant_id_ = #{tenantId}
 	</update>
 
 	<!-- 根据主键删除一条记录 -->
@@ -98,13 +99,13 @@
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="VipGroupCategory"
 		parameterType="map">
-		SELECT * FROM vip_group_category where del_flag_ != 1 ORDER BY id_
+		SELECT * FROM vip_group_category where del_flag_ != 1 and tenant_id_ = #{tenantId} ORDER BY id_
 		<include refid="global.limit" />
 	</select>
 
 	<!-- 查询当前表的总记录数 -->
 	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM vip_group_category where del_flag_ != 1
+		SELECT COUNT(*) FROM vip_group_category where del_flag_ != 1 and tenant_id_ = #{tenantId}
 	</select>
 	<select id="findConditionCategorys" resultType="com.ym.mec.biz.dal.dto.ConditionDto">
       	select id_ id,name_ `name` from vip_group_category where del_flag_ != 1

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

@@ -14,6 +14,7 @@
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
 		<result column="organ_id_" property="organId"/>
+        <result column="tenant_id_" property="tenantId"/>
 	</resultMap>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -23,7 +24,7 @@
 	
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="VipGroupDefaultClassesCycle">
-		SELECT * FROM vip_group_default_classes_cycle ORDER BY id_
+		SELECT * FROM vip_group_default_classes_cycle where tenant_id_ = #{tenantId} ORDER BY id_
 	</select>
 	
 	<!-- 向数据库增加一条记录 -->
@@ -33,17 +34,17 @@
 		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
 		</selectKey>
 		-->
-		INSERT INTO vip_group_default_classes_cycle (id_,min_class_times_,max_class_times_,month_,create_time_,update_time_,organ_id_)
+		INSERT INTO vip_group_default_classes_cycle (id_,min_class_times_,max_class_times_,month_,create_time_,update_time_,organ_id_,tenant_id_)
 		VALUE
 		<foreach collection="list" item="vipGroupDefaultClassesCycle" separator=",">
 			(#{vipGroupDefaultClassesCycle.id},#{vipGroupDefaultClassesCycle.minClassTimes},
-			#{vipGroupDefaultClassesCycle.maxClassTimes},#{vipGroupDefaultClassesCycle.month},now(),now(),#{vipGroupDefaultClassesCycle.organId})
+			#{vipGroupDefaultClassesCycle.maxClassTimes},#{vipGroupDefaultClassesCycle.month},now(),now(),#{vipGroupDefaultClassesCycle.organId},#{vipGroupDefaultClassesCycle.tenantId})
 		</foreach>
 	</insert>
 
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.VipGroupDefaultClassesCycle" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		INSERT INTO vip_group_default_classes_cycle (id_,min_class_times_,max_class_times_,month_,create_time_,update_time_,organ_id_) VALUES(#{id},#{minClassTimes},#{maxClassTimes},#{month},now(),now(),#{organId})
+		INSERT INTO vip_group_default_classes_cycle (id_,min_class_times_,max_class_times_,month_,create_time_,update_time_,organ_id_,tenant_id_) VALUES(#{id},#{minClassTimes},#{maxClassTimes},#{month},now(),now(),#{organId},#{tenantId})
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -67,7 +68,7 @@ month_ = #{month},
 <if test="createTime != null">
 create_time_ = #{createTime},
 </if>
-</set> WHERE id_ = #{id} 
+</set> WHERE id_ = #{id} and tenant_id_ = #{tenantId}
 	</update>
 	
 	<!-- 根据主键删除一条记录 -->
@@ -75,54 +76,38 @@ create_time_ = #{createTime},
 		DELETE FROM vip_group_default_classes_cycle WHERE id_ = #{id} 
 	</delete>
 	<delete id="deleteAll" >
-		DELETE FROM vip_group_default_classes_cycle
+		DELETE FROM vip_group_default_classes_cycle where tenant_id_ = #{tenantId}
 	</delete>
 	
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="VipGroupDefaultClassesCycle" parameterType="map">
-		SELECT * FROM vip_group_default_classes_cycle ORDER BY id_ <include refid="global.limit"/>
+		SELECT * FROM vip_group_default_classes_cycle where tenant_id_ = #{tenantId} ORDER BY id_ <include refid="global.limit"/>
 	</select>
 	
 	<!-- 查询当前表的总记录数 -->
 	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM vip_group_default_classes_cycle
+		SELECT COUNT(*) FROM vip_group_default_classes_cycle where tenant_id_ = #{tenantId}
 	</select>
 	<select id="checkMaxClassTimes" resultMap="VipGroupDefaultClassesCycle">
 		SELECT
 			*
 		FROM
 			vip_group_default_classes_cycle
-			WHERE max_class_times_=#{maxClassTimes}
+			WHERE max_class_times_=#{maxClassTimes} and tenant_id_ = #{tenantId}
 		ORDER BY max_class_times_ LIMIT 1
 	</select>
-	<select id="findByMaxClassTimes" resultMap="VipGroupDefaultClassesCycle">
-		SELECT
-		*
-		FROM
-		vip_group_default_classes_cycle
-		WHERE max_class_times_&lt;#{maxClassTimes}
-		ORDER BY max_class_times_ DESC LIMIT 1
-	</select>
-	<select id="findByMinClassTimes" resultMap="VipGroupDefaultClassesCycle">
-		SELECT
-			*
-		FROM
-			vip_group_default_classes_cycle
-			WHERE min_class_times_&gt;#{minClassTimes}
-		ORDER BY min_class_times_ LIMIT 1
-	</select>
     <select id="countAll" resultType="int">
 		SELECT
 			count(*)
 		FROM
-			vip_group_default_classes_cycle
+			vip_group_default_classes_cycle where tenant_id_ = #{tenantId}
 		LIMIT 1
     </select>
 	<select id="findAllCycle" resultMap="VipGroupDefaultClassesCycle">
 		SELECT
 			*
 		FROM
-			vip_group_default_classes_cycle
+			vip_group_default_classes_cycle where tenant_id_ = #{tenantId}
 		ORDER BY max_class_times_
 	</select>
     <select id="findByOrganAndClassTimes" resultMap="VipGroupDefaultClassesCycle">
@@ -132,6 +117,6 @@ create_time_ = #{createTime},
 			vip_group_default_classes_cycle
 		WHERE
 			#{classTimes} &gt;= min_class_times_
-			AND #{classTimes} &lt;= max_class_times_
+			AND #{classTimes} &lt;= max_class_times_ and tenant_id_ = #{tenantId}
     </select>
 </mapper>

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

@@ -14,6 +14,7 @@
 		<result column="offline_classes_unit_price_" property="offlineClassesUnitPrice" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
+        <result column="tenant_id_" property="tenantId"/>
 	</resultMap>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -23,18 +24,9 @@
 	
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="VipGroupDefaultClassesUnitPrice">
-		SELECT * FROM vip_group_default_classes_unit_price_ ORDER BY id_
+		SELECT * FROM vip_group_default_classes_unit_price_ where tenant_id_ = #{tenantId} ORDER BY id_
 	</select>
 
-	<!-- 全查询 -->
-	<select id="findAllByOrgan" resultMap="VipGroupDefaultClassesUnitPrice">
-		SELECT * FROM vip_group_default_classes_unit_price_
-		<if test="organId!=null">
-			WHERE organ_id_=#{organId}
-		</if>
-		ORDER BY id_
-	</select>
-	
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.VipGroupDefaultClassesUnitPrice" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
 		<!--
@@ -42,7 +34,7 @@
 		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
 		</selectKey>
 		-->
-		INSERT INTO vip_group_default_classes_unit_price_ (id_,organ_id_,vip_group_category_id_,online_classes_unit_price_,offline_classes_unit_price_,create_time_,update_time_) VALUES(#{id},#{organId},#{vipGroupCategoryId},#{onlineClassesUnitPrice},#{offlineClassesUnitPrice},#{createTime},NOW())
+		INSERT INTO vip_group_default_classes_unit_price_ (id_,organ_id_,vip_group_category_id_,online_classes_unit_price_,offline_classes_unit_price_,create_time_,update_time_,tenant_id_) VALUES(#{id},#{organId},#{vipGroupCategoryId},#{onlineClassesUnitPrice},#{offlineClassesUnitPrice},#{createTime},NOW(),#{tenantId})
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -69,7 +61,7 @@ vip_group_category_id_ = #{vipGroupCategoryId},
 <if test="createTime != null">
 create_time_ = #{createTime},
 </if>
-</set> WHERE id_ = #{id} 
+</set> WHERE id_ = #{id} and tenant_id_ = #{tenantId}
 	</update>
 
 	<!-- 根据主键查询一条记录 -->
@@ -106,12 +98,12 @@ create_time_ = #{createTime},
 	
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="VipGroupDefaultClassesUnitPrice" parameterType="map">
-		SELECT * FROM vip_group_default_classes_unit_price_ ORDER BY id_ <include refid="global.limit"/>
+		SELECT * FROM vip_group_default_classes_unit_price_ where tenant_id_ = #{tenantId} ORDER BY id_ <include refid="global.limit"/>
 	</select>
 	
 	<!-- 查询当前表的总记录数 -->
 	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM vip_group_default_classes_unit_price_
+		SELECT COUNT(*) FROM vip_group_default_classes_unit_price_ where tenant_id_ = #{tenantId}
 	</select>
     <select id="getByVipGroup" resultMap="VipGroupDefaultClassesUnitPrice">
 		SELECT

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

@@ -139,7 +139,7 @@
         cs.status_ course_status_,cs.name_ class_group_name_
         FROM course_schedule_student_payment cssp
         LEFT JOIN course_schedule cs ON cssp.course_schedule_id_ = cs.id_
-        WHERE cssp.group_type_ = 'VIP'
+        WHERE cssp.group_type_ = 'VIP' and cssp.tenant_id_ = #{tenantId}
         <if test="vipGroupId != null">
             AND cssp.music_group_id_ = #{vipGroupId}
         </if>
@@ -157,7 +157,7 @@
         SELECT COUNT(cssp.id_)
         FROM course_schedule_student_payment cssp
         LEFT JOIN course_schedule cs ON cssp.course_schedule_id_ = cs.id_
-        WHERE cssp.group_type_ = 'VIP'
+        WHERE cssp.group_type_ = 'VIP' and cssp.tenant_id_ = #{tenantId}
         <if test="vipGroupId != null">
             AND cssp.music_group_id_ = #{vipGroupId}
         </if>
@@ -172,14 +172,14 @@
     <!-- 全查询 -->
     <select id="findAll" resultMap="VipGroup">
         SELECT *
-        FROM vip_group
+        FROM vip_group where tenant_id_ = #{tenantId}
         ORDER BY id_
     </select>
 
     <sql id="vipGroupQueryCondition">
         <where>
             1=1
-            AND vg.audit_status_='PASS' AND vg.group_status_ != 7
+            AND vg.audit_status_='PASS' AND vg.group_status_ != 7 and vg.tenant_id_ = #{tenantId}
             <if test="search!=null and search!=''">
                 AND (vg.name_ LIKE CONCAT('%',#{search},'%') OR vg.id_= #{search})
             </if>
@@ -322,7 +322,7 @@
                 educational_teacher_id_=#{educationalTeacherId},
             </if>
         </set>
-        WHERE id_ = #{id}
+        WHERE id_ = #{id} and tenant_id_ = #{tenantId}
     </update>
 
     <!-- 根据主键删除一条记录 -->
@@ -334,14 +334,14 @@
 
     <!-- 分页查询 -->
     <select id="queryPage" resultMap="VipGroup" parameterType="map">
-        SELECT * FROM vip_group ORDER BY id_
+        SELECT * FROM vip_group where tenant_id_ = #{tenantId} ORDER BY id_
         <include refid="global.limit"/>
     </select>
 
     <!-- 查询当前表的总记录数 -->
     <select id="queryCount" resultType="int">
         SELECT COUNT(*)
-        FROM vip_group
+        FROM vip_group where tenant_id_ = #{tenantId}
     </select>
 
     <select id="getLockVipGroup" resultMap="VipGroup">
@@ -441,6 +441,7 @@
 
     <sql id="vipGroupAttendanceQueryCondition">
         <where>
+        	vg.tenant_id_ = #{tenantId}
             <if test="vipGroupId!=null">
                 and vg.id_=#{vipGroupId}
             </if>
@@ -574,7 +575,7 @@
         sys_user_cash_account suca
         LEFT JOIN sys_user su ON suca.user_id_=su.id_
         WHERE
-            1=1
+            suca.tenant_id_ = #{tenantId}
         AND su.user_type_ LIKE '%STUDENT%'
 #         suca.course_balance_ >0
         <if test="search!=null and search!=''">
@@ -596,7 +597,7 @@
         sys_user_cash_account suca
         LEFT JOIN sys_user su ON suca.user_id_=su.id_
         WHERE
-            1=1
+            suca.tenant_id_ = #{tenantId}
         AND su.user_type_ LIKE '%STUDENT%'
 #         suca.course_balance_ >0
         <if test="search!=null and search!=''">
@@ -800,7 +801,7 @@
     <select id="queryVipGroupNum" resultType="map">
         select count(*) total,sum(case when group_status_ = 2 then 1 else 0 end) applying_num_,sum(case when
         group_status_ = 4 then 1 else 0 end) finished_num_ from vip_group
-        where organ_id_ not in (36,38)
+        where organ_id_ not in (36,38) and tenant_id_ = #{tenantId}
         <if test="organId != null">
             and FIND_IN_SET(organ_id_,#{organId})
         </if>
@@ -810,7 +811,7 @@
         select count(cs.id_) from course_schedule cs left join vip_group vg on cs.music_group_id_ = vg.id_ where
         cs.type_ in ('VIP')
         and DATE_FORMAT(cs.class_date_, '%Y%m' ) = DATE_FORMAT(CURDATE() , '%Y%m') and (cs.del_flag_ = 0 or cs.del_flag_
-        is null) and vg.organ_id_ not in (36,38)
+        is null) and vg.organ_id_ not in (36,38) and vg.tenant_id_ = #{tenantId}
         <if test="organId != null">
             AND FIND_IN_SET(vg.organ_id_,#{organId})
         </if>
@@ -821,7 +822,10 @@
         FROM vip_group
         WHERE (payment_expire_date_ &lt; DATE_FORMAT(NOW(), '%Y-%m-%d')
             OR courses_start_date &lt; NOW())
-          AND group_status_ = 1
+          AND group_status_ = 1 
+          <if test="tenantId != null">
+          and tenant_id_ = #{tenantId}
+          </if>
     </select>
 
     <select id="countStudentPaymentNum" resultType="int">
@@ -938,7 +942,7 @@
                     student_id_list_=#{item.studentIdList},
                 </if>
             </set>
-            WHERE id_ = #{item.id}
+            WHERE id_ = #{item.id} and tenant_id_ = #{item.tenantId}
         </foreach>
     </update>
 
@@ -995,17 +999,6 @@
         GROUP BY cgsm.user_id_
     </select>
 
-    <select id="queryVipCourseStudentInfo" resultMap="vipCourseStudentInfoDto">
-        SELECT cssp.music_group_id_,
-               ifnull(sum(cssp.expect_price_), 0)         total_amount_,
-               ifnull(count(DISTINCT (cssp.user_id_)), 0) student_num_,
-               ifnull(count(cssp.id_), 0)                 total_times_
-        FROM course_schedule_student_payment cssp
-                 LEFT JOIN course_schedule cs on cs.id_ = cssp.course_schedule_id_
-        WHERE cs.group_type_ = 'VIP'
-        GROUP BY cssp.music_group_id_
-    </select>
-
     <select id="countUserRepeatVipGroupInCourseStartEndTime" resultType="int">
         SELECT COUNT(id_)
         FROM vip_group
@@ -1019,6 +1012,7 @@
         LEFT JOIN sys_user t on vg.user_id_ = t.id_
         LEFT JOIN sys_user et on vg.educational_teacher_id_ = et.id_
         <where>
+        	vg.tenant_id_ = #{tenantId}
             <if test="groupIds != null">
                 AND vg.id_ IN
                 <foreach collection="groupIds" item="groupId" open="(" close=")" separator=",">

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

@@ -13,6 +13,7 @@
 		<result column="online_classes_unit_price_" property="onlineClassesUnitPrice" />
 		<result column="offline_classes_unit_price_" property="offlineClassesUnitPrice" />
 		<result column="payment_price_" property="paymentPrice" />
+        <result column="tenant_id_" property="tenantId"/>
 	</resultMap>
 
 	<!-- 根据主键查询一条记录 -->
@@ -22,7 +23,7 @@
 
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="VipGroupStudentCoursePrice">
-		SELECT * FROM vip_group_student_course_price ORDER BY id_
+		SELECT * FROM vip_group_student_course_price where tenant_id_ = #{tenantId} ORDER BY id_
 	</select>
 
 	<!-- 向数据库增加一条记录 -->
@@ -32,15 +33,15 @@
 		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
 		</selectKey>
 		-->
-		INSERT INTO vip_group_student_course_price (vip_group_id_,student_id_,online_classes_unit_price_,offline_classes_unit_price_,payment_price_)
-		VALUES(#{vipGroupId},#{studentId},#{onlineClassesUnitPrice},#{offlineClassesUnitPrice},#{paymentPrice})
+		INSERT INTO vip_group_student_course_price (vip_group_id_,student_id_,online_classes_unit_price_,offline_classes_unit_price_,payment_price_,tenant_id_)
+		VALUES(#{vipGroupId},#{studentId},#{onlineClassesUnitPrice},#{offlineClassesUnitPrice},#{paymentPrice},#{tenantId})
 	</insert>
 
 	<insert id="batchInsert" parameterType="com.ym.mec.biz.dal.entity.VipGroupStudentCoursePrice" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		INSERT INTO vip_group_student_course_price (vip_group_id_,student_id_,online_classes_unit_price_,offline_classes_unit_price_,payment_price_)
+		INSERT INTO vip_group_student_course_price (vip_group_id_,student_id_,online_classes_unit_price_,offline_classes_unit_price_,payment_price_,tenant_id_)
 		VALUE
 		<foreach collection="datas" item="data" separator=",">
-			(#{data.vipGroupId},#{data.studentId},#{data.onlineClassesUnitPrice},#{data.offlineClassesUnitPrice},#{data.paymentPrice})
+			(#{data.vipGroupId},#{data.studentId},#{data.onlineClassesUnitPrice},#{data.offlineClassesUnitPrice},#{data.paymentPrice},#{data.tenantId})
 		</foreach>
 	</insert>
 
@@ -65,7 +66,7 @@
 		<if test="paymentPrice != null">
 			payment_price_ = #{paymentPrice},
 		</if>
-	</set> WHERE id_ = #{id}
+	</set> WHERE id_ = #{id} and tenant_id_ = #{tenantId}
 	</update>
 
 	<!-- 根据主键删除一条记录 -->
@@ -75,12 +76,12 @@
 
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="VipGroupStudentCoursePrice" parameterType="map">
-		SELECT * FROM vip_group_student_course_price ORDER BY id_ <include refid="global.limit"/>
+		SELECT * FROM vip_group_student_course_price where tenant_id_ = #{tenantId} ORDER BY id_ <include refid="global.limit"/>
 	</select>
 
 	<!-- 查询当前表的总记录数 -->
 	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM vip_group_student_course_price
+		SELECT COUNT(*) FROM vip_group_student_course_price where tenant_id_ = #{tenantId}
 	</select>
 
     <select id="getVipGroupStudentCoursePrice" resultMap="VipGroupStudentCoursePrice">

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

@@ -15,6 +15,7 @@
 		<result column="jpush_type_" property="jpushType" />
 		<result column="agrs_" property="agrs" />
 		<result column="create_time_" property="createTime" />
+        <result column="tenant_id_" property="tenantId"/>
 	</resultMap>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -24,13 +25,13 @@
 	
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="WaitSendMessage">
-		SELECT * FROM wait_send_message ORDER BY id_
+		SELECT * FROM wait_send_message where tenant_id_ = #{tenantId} ORDER BY id_
 	</select>
 	
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.WaitSendMessage" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		INSERT INTO wait_send_message (message_sender_,message_type_,receivers_,url_,jpush_type_,agrs_,create_time_)
-		VALUES(#{messageSender},#{messageType},#{receivers},#{url},#{jpushType},#{agrs},NOW())
+		INSERT INTO wait_send_message (message_sender_,message_type_,receivers_,url_,jpush_type_,agrs_,create_time_,tenant_id_)
+		VALUES(#{messageSender},#{messageType},#{receivers},#{url},#{jpushType},#{agrs},NOW(),#{tenantId})
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -54,7 +55,7 @@
 		<if test="agrs != null">
 		agrs_ = #{agrs},
 		</if>
-		</set> WHERE id_ = #{id}
+		</set> WHERE id_ = #{id} and tenant_id_ = #{tenantId}
 	</update>
 	
 	<!-- 根据主键删除一条记录 -->
@@ -64,11 +65,11 @@
 	
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="WaitSendMessage" parameterType="map">
-		SELECT * FROM wait_send_message ORDER BY id_ <include refid="global.limit"/>
+		SELECT * FROM wait_send_message where tenant_id_ = #{tenantId} ORDER BY id_ <include refid="global.limit"/>
 	</select>
 	
 	<!-- 查询当前表的总记录数 -->
 	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM wait_send_message
+		SELECT COUNT(*) FROM wait_send_message where tenant_id_ = #{tenantId}
 	</select>
 </mapper>

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

@@ -2672,7 +2672,7 @@ public class ExportController extends BaseController {
         List<PracticeCourseDto> practiceGroupsTeacher = new ArrayList<>();
         List<Student> studentTeachers = new ArrayList<>();
         if (vipGroupIds.size() > 0) {
-            vipGroupTeachers = vipGroupDao.getGroupTeachers(vipGroupIds);
+            vipGroupTeachers = vipGroupDao.getGroupTeachers(vipGroupIds, TenantContextHolder.getTenantId());
         }
 
         if (practiceGroupIds.size() > 0) {

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

@@ -86,6 +86,8 @@ public class IndexController extends BaseController {
 		}else if(StringUtils.isEmpty(organId)){
 			return failed(HttpStatus.INTERNAL_SERVER_ERROR, "分部信息错误");
 		}
+		
+		Integer tenantId = TenantContextHolder.getTenantId();
 
 		Map<String, Integer> musicDatas = musicGroupDao.queryOrganMusicGroupNum(organId, TenantContextHolder.getTenantId());
 		
@@ -93,13 +95,13 @@ public class IndexController extends BaseController {
 		
 		Map<String, Integer> studentDatas = studentRegistrationDao.queryStudentNum(organId);
 		
-		Map<String, Integer> vipDatas = vipGroupDao.queryVipGroupNum(organId);
+		Map<String, Integer> vipDatas = vipGroupDao.queryVipGroupNum(organId, tenantId);
 
 		Map<String, Integer> demoDatas = demoGroupDao.queryDemoGroupNum(organId);
 		
-		Integer musicGroupNum = musicGroupDao.queryCurrentMonthCoursesNum(organId, TenantContextHolder.getTenantId());
+		Integer musicGroupNum = musicGroupDao.queryCurrentMonthCoursesNum(organId, tenantId);
 		
-		Integer vipGroupNum = vipGroupDao.queryCurrentMonthCoursesNum(organId);
+		Integer vipGroupNum = vipGroupDao.queryCurrentMonthCoursesNum(organId, tenantId);
 		
 		Integer demoGroupNum = demoGroupDao.queryCurrentMonthCoursesNum(organId);
 		

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

@@ -233,7 +233,7 @@ public class TaskController extends BaseController {
 	@GetMapping("/stopVipGroupWithNoCreate")
 	// 取消达到报名时间未达到报名人数的vip课
 	public void stopVipGroupWithNoCreate() {
-		vipGroupService.stopVipGroupWithNoCreate();
+		vipGroupService.stopVipGroupWithNoCreate(null);
 	}
 
 	@GetMapping("/pushNoSignOutMessage")

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

@@ -18,10 +18,13 @@ import com.ym.mec.biz.service.*;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
 import com.ym.mec.common.exception.BizException;
+import com.ym.mec.common.tenant.TenantContextHolder;
 import com.ym.mec.util.date.DateUtil;
 import com.yonge.log.model.AuditLogAnnotation;
+
 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.security.access.prepost.PreAuthorize;
@@ -427,7 +430,7 @@ public class VipGroupManageController extends BaseController {
     @ApiOperation(value = "取消达到报名时间未达到报名人数的vip课")
     @PostMapping(value = "/stopVipGroupWithNoCreate")
     public Object stopVipGroupWithNoCreate(){
-        vipGroupService.stopVipGroupWithNoCreate();
+        vipGroupService.stopVipGroupWithNoCreate(TenantContextHolder.getTenantId());
         return succeed();
     }