update

mec-auth/mec-auth-api/src/main/java/com/ym/mec/auth/api/dto/MenuQueryInfo.java

@@ -2,7 +2,9 @@ package com.ym.mec.auth.api.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 
-public class MenuQueryInfo{
+import com.ym.mec.common.page.QueryInfo;
+
+public class MenuQueryInfo extends QueryInfo{
     @ApiModelProperty(value = "父节点编号，默认0",required = false)
     private Integer parentId = 0;
 

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

@@ -39,5 +39,5 @@ public interface MusicGroupSchoolTermCourseDetailDao extends BaseDAO<Integer, Mu
      * @param remindCourseTime
      * @return
      */
-    List<String> queryPushCourseTermMusicIds(String remindCourseTime);
+    List<String> queryPushCourseTermMusicIds(@Param("remindCourseTime") String remindCourseTime, @Param("tenantId") Integer tenantId);
 }

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

@@ -57,13 +57,6 @@ public interface MusicGroupStudentFeeDao extends BaseDAO<Long, MusicGroupStudent
 	int updateNextPaymentDate(@Param("musicGroupId") String musicGroupId, @Param("nextPaymentDate") Date nextPaymentDate);
 
 	/**
-	 * 根据可提前缴费的天数查询即将续费的列表
-	 * @param days 可提前缴费天数
-	 * @return
-	 */
-	List<MusicGroupStudentFee> queryWillRenewList(int days);
-
-	/**
 	 * 批量更新对象
 	 * @param updateList
 	 * @return

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

@@ -18,7 +18,7 @@ public interface OrganizationDao extends BaseDAO<Integer, Organization> {
 
     List<Organization> findOrgans(@Param("organIds") List<Integer> organIds);
 
-    List<Organization> getOrgans(@Param("organIds") List<Integer> organIds);
+    List<Organization> getOrgans(@Param("organIds") List<Integer> organIds, @Param("tenantId") Integer tenantId);
 
     /**
      * 根据分部id字符串查询
@@ -55,8 +55,6 @@ public interface OrganizationDao extends BaseDAO<Integer, Organization> {
      */
 	String getOrganName(String organId);
 	
-	List<Organization> findAllOrgans();
-
-	List<Organization> getActivityOrgans();
+	List<Organization> findAllOrgans(Integer tenantId);
 
 }

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

@@ -248,7 +248,7 @@ public interface PracticeGroupDao extends com.ym.mec.common.dal.BaseDAO<Long, Pr
      * @param organIds
      * @return
      */
-    List<CourseGroupExportDto> getPracticeGroupExport(@Param("organIds") String organIds);
+    List<CourseGroupExportDto> getPracticeGroupExport(@Param("organIds") String organIds,@Param("tenantId") Integer tenantId);
 
     /**
      * @return java.util.List<com.ym.mec.biz.dal.dto.SimpleUserDto>

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

@@ -20,5 +20,5 @@ public interface QuestionnaireQuestionDao extends BaseDAO<Long, QuestionnaireQue
      * @param activeType
      * @return
      */
-    List<QuestionnaireQuestion> findByActiveType(String activeType);
+    List<QuestionnaireQuestion> findByActiveType(@Param("activeType") String activeType, @Param("tenantId") Integer tenantId);
 }

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

@@ -12,7 +12,7 @@ public interface ReplacementInstrumentCooperationDao extends com.ym.mec.common.d
      * 统计个合作单位的转化率
      * @return
      */
-    List<ReplacementInstrumentCooperation> countAllReplacementsInfo();
+    List<ReplacementInstrumentCooperation> countAllReplacementsInfo(Integer tenantId);
 
     ReplacementInstrumentCooperation findByCooperationOrganIdAndTopicId(@Param("cooperationOrganId") Integer cooperationOrganId, @Param("topicId") Integer topicId);
 }

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

@@ -8,5 +8,5 @@ import java.util.List;
 public interface ResourceRespositoryDao extends com.ym.mec.common.dal.BaseDAO<Integer, ResourceRespository> {
 
 
-    List<ResourceRespository> findList(@Param("parentId") Integer parentId, @Param("delFlag") String delFlag, @Param("subjectId") Integer subjectId);
+    List<ResourceRespository> findList(@Param("parentId") Integer parentId, @Param("delFlag") String delFlag, @Param("subjectId") Integer subjectId, @Param("tenantId") Integer tenantId);
 }

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

@@ -34,7 +34,7 @@ public interface SellOrderDao extends BaseDAO<Integer, SellOrder> {
      * @param endTime
      * @return
      */
-    List<OperatingReport> getMusicGroupMonthReport(@Param("startTime") Date startTime, @Param("endTime") Date endTime);
+    List<OperatingReport> getMusicGroupMonthReport(@Param("startTime") Date startTime, @Param("endTime") Date endTime, @Param("tenantId") Integer tenantId);
 
     /**
      * 获取分部学校的收入支出(VIP 网管课订单)
@@ -43,7 +43,7 @@ public interface SellOrderDao extends BaseDAO<Integer, SellOrder> {
      * @param endTime
      * @return
      */
-    List<OperatingReport> getMusicVipPracticeMonthReport(@Param("startTime") Date startTime, @Param("endTime") Date endTime);
+    List<OperatingReport> getMusicVipPracticeMonthReport(@Param("startTime") Date startTime, @Param("endTime") Date endTime, @Param("tenantId") Integer tenantId);
 
     /**
      * 获取分部学校的收入支出(外部订单)
@@ -52,7 +52,7 @@ public interface SellOrderDao extends BaseDAO<Integer, SellOrder> {
      * @param endTime
      * @return
      */
-    List<OperatingReport> getOutOrderMonthReport(@Param("startTime") Date startTime, @Param("endTime") Date endTime);
+    List<OperatingReport> getOutOrderMonthReport(@Param("startTime") Date startTime, @Param("endTime") Date endTime, @Param("tenantId") Integer tenantId);
 
     /**
      * 获取分部学校的收入支出(充值)
@@ -61,7 +61,7 @@ public interface SellOrderDao extends BaseDAO<Integer, SellOrder> {
      * @param endTime
      * @return
      */
-    List<OperatingReport> getRechargeMonthReport(@Param("startTime") Date startTime, @Param("endTime") Date endTime);
+    List<OperatingReport> getRechargeMonthReport(@Param("startTime") Date startTime, @Param("endTime") Date endTime, @Param("tenantId") Integer tenantId);
 
     /**
      * 获取分部学校的收入支出(零星支付)
@@ -70,7 +70,7 @@ public interface SellOrderDao extends BaseDAO<Integer, SellOrder> {
      * @param endTime
      * @return
      */
-    List<OperatingReport> getSporadicMonthReport(@Param("startTime") Date startTime, @Param("endTime") Date endTime);
+    List<OperatingReport> getSporadicMonthReport(@Param("startTime") Date startTime, @Param("endTime") Date endTime, @Param("tenantId") Integer tenantId);
 
     /**
      * 维修单
@@ -79,7 +79,7 @@ public interface SellOrderDao extends BaseDAO<Integer, SellOrder> {
      * @param endTime
      * @return
      */
-    List<OperatingReport> getRepairGoodsSellGroupMonthReport(@Param("startTime") Date startTime, @Param("endTime") Date endTime);
+    List<OperatingReport> getRepairGoodsSellGroupMonthReport(@Param("startTime") Date startTime, @Param("endTime") Date endTime, @Param("tenantId") Integer tenantId);
 
     /**
      * 维修单,总收入
@@ -88,7 +88,7 @@ public interface SellOrderDao extends BaseDAO<Integer, SellOrder> {
      * @param endTime
      * @return
      */
-    List<OperatingReport> getRepairGoodsSellGroupIncome(@Param("startTime") Date startTime, @Param("endTime") Date endTime);
+    List<OperatingReport> getRepairGoodsSellGroupIncome(@Param("startTime") Date startTime, @Param("endTime") Date endTime, @Param("tenantId") Integer tenantId);
 
 
     /**
@@ -98,7 +98,7 @@ public interface SellOrderDao extends BaseDAO<Integer, SellOrder> {
      * @param endTime
      * @return
      */
-    List<OperatingReport> getGoodsSellGroupMonthReport(@Param("startTime") Date startTime, @Param("endTime") Date endTime);
+    List<OperatingReport> getGoodsSellGroupMonthReport(@Param("startTime") Date startTime, @Param("endTime") Date endTime, @Param("tenantId") Integer tenantId);
 
 
     /**
@@ -116,7 +116,7 @@ public interface SellOrderDao extends BaseDAO<Integer, SellOrder> {
      * @param endTime
      * @return
      */
-    List<OperatingReport> getMusicGroupIncome(@Param("startTime") Date startTime, @Param("endTime") Date endTime);
+    List<OperatingReport> getMusicGroupIncome(@Param("startTime") Date startTime, @Param("endTime") Date endTime, @Param("tenantId") Integer tenantId);
 
     /**
      * 外部订单总收入
@@ -125,7 +125,7 @@ public interface SellOrderDao extends BaseDAO<Integer, SellOrder> {
      * @param endTime
      * @return
      */
-    List<OperatingReport> getOutOrderIncome(@Param("startTime") Date startTime, @Param("endTime") Date endTime);
+    List<OperatingReport> getOutOrderIncome(@Param("startTime") Date startTime, @Param("endTime") Date endTime, @Param("tenantId") Integer tenantId);
 
     /**
      * 获取订单的销售成本
@@ -142,21 +142,21 @@ public interface SellOrderDao extends BaseDAO<Integer, SellOrder> {
      * @param endTime
      * @return
      */
-    List<OperatingReport> getSubjectChangeMonthReport(@Param("startTime") Date startTime, @Param("endTime") Date endTime);
+    List<OperatingReport> getSubjectChangeMonthReport(@Param("startTime") Date startTime, @Param("endTime") Date endTime, @Param("tenantId") Integer tenantId);
 
     /**
      * 获取声部更换的总收入
      *
      * @return
      */
-    List<OperatingReport> getSubjectChangeGroupIncome(@Param("startTime") Date startTime, @Param("endTime") Date endTime);
+    List<OperatingReport> getSubjectChangeGroupIncome(@Param("startTime") Date startTime, @Param("endTime") Date endTime, @Param("tenantId") Integer tenantId);
 
     /**
      * 统计退货的商品费用
      *
      * @return
      */
-    List<OperatingReport> getRefundIncome(@Param("startTime") Date startTime, @Param("endTime") Date endTime);
+    List<OperatingReport> getRefundIncome(@Param("startTime") Date startTime, @Param("endTime") Date endTime, @Param("tenantId") Integer tenantId);
 
 
     /**
@@ -174,7 +174,7 @@ public interface SellOrderDao extends BaseDAO<Integer, SellOrder> {
      * @author Joburgess
      * @date 2020.10.13
      */
-    List<Integer> getNoneBatchNoSellOrderIds();
+    List<Integer> getNoneBatchNoSellOrderIds(Integer tenantId);
 
 
     /**

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

@@ -31,12 +31,12 @@ public interface SporadicChargeInfoDao extends BaseDAO<Integer, SporadicChargeIn
      * @param type
      * @return
      */
-    List<Organization> getActiveOrgans(@Param("type") Integer type);
+    List<Organization> getActiveOrgans(@Param("type") Integer type,@Param("tenantId") Integer tenantId);
 
     /**
      * 获取活动分部的最大缴费金额
      * @param type
      * @return
      */
-    List<OrganMaxAmountDto> getActiveOrgansMaxAmount(@Param("type") Integer type);
+    List<OrganMaxAmountDto> getActiveOrgansMaxAmount(@Param("type") Integer type,@Param("tenantId") Integer tenantId);
 }

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

@@ -2,6 +2,7 @@ package com.ym.mec.biz.dal.dao;
 
 import com.ym.mec.biz.dal.entity.StudentCompetition;
 import com.ym.mec.common.dal.BaseDAO;
+
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -29,7 +30,7 @@ public interface StudentCompetitionDao extends BaseDAO<Long, StudentCompetition>
      * @date 2020.11.10
      * @return java.util.List<com.ym.mec.biz.dal.dto.StudentCompetitionRankingDto>
      */
-    List<StudentCompetition> getWinnerList();
+    List<StudentCompetition> getWinnerList(Integer tenantId);
 
     /**
      * @describe 获取指定奖项级别的作品编号列表
@@ -38,6 +39,6 @@ public interface StudentCompetitionDao extends BaseDAO<Long, StudentCompetition>
      * @param prizeLevel:
      * @return java.util.Set<java.lang.Long>
      */
-    Set<Long> getCompetitionsWithPrizeLevel(@Param("prizeLevel") Integer prizeLevel);
+    Set<Long> getCompetitionsWithPrizeLevel(@Param("prizeLevel") Integer prizeLevel, @Param("tenantId") Integer tenantId);
 
 }

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

@@ -89,7 +89,7 @@ public interface StudentDao extends com.ym.mec.common.dal.BaseDAO<Integer, Stude
      * @date 2020.04.29
      */
 
-    List<Student> getServiceStudents();
+    List<Student> getServiceStudents(Integer tenantId);
 
     /**
      * @return java.util.List<java.lang.Integer>
@@ -97,9 +97,9 @@ public interface StudentDao extends com.ym.mec.common.dal.BaseDAO<Integer, Stude
      * @author Joburgess
      * @date 2020.06.04
      */
-    List<Integer> getServeStudentIds();
+    List<Integer> getServeStudentIds(Integer tenantId);
 
-    List<StudentServeCourseDto> getServeStudentCourseStartTimes(@Param("monday") String monday);
+    List<StudentServeCourseDto> getServeStudentCourseStartTimes(@Param("monday") String monday, @Param("tenantId") Integer tenantId);
 
     List<StudentServeCourseDto> getStudentFutureCourseInfo(@Param("monday") String monday,
                                                            @Param("nextMonday") String nextMonday,
@@ -107,16 +107,6 @@ public interface StudentDao extends com.ym.mec.common.dal.BaseDAO<Integer, Stude
 
     List<StudentServeCourseDto> getNoCourseBeServeStudentInfo(@Param("noCourseStudentIds") List<Integer> noCourseStudentIds);
 
-    /**
-     * @param monday:
-     * @return java.util.List<com.ym.mec.biz.dal.dto.StudentServeDto>
-     * @describe 查询被服务学员信息
-     * @author Joburgess
-     * @date 2020.05.27
-     */
-    List<StudentServeDto> getBeServiceStudents(@Param("monday") String monday,
-                                               @Param("courseExpireDate") Date courseExpireDate);
-
 
     List<StudentServeDto> getBeServiceStudentsInfoWithStudents(@Param("monday") String monday,
                                                                @Param("courseExpireDate") Date courseExpireDate,
@@ -234,7 +224,7 @@ public interface StudentDao extends com.ym.mec.common.dal.BaseDAO<Integer, Stude
      * @param pushMemberRenew
      * @return
      */
-    List<Integer> queryPushMemberRenew(String pushMemberRenew);
+    List<Integer> queryPushMemberRenew(@Param("pushMemberRenew") String pushMemberRenew,@Param("tenantId") Integer tenantId);
 
     /**
      * 清空学员会员
@@ -350,7 +340,6 @@ public interface StudentDao extends com.ym.mec.common.dal.BaseDAO<Integer, Stude
      */
     int getOrganEVipStudentNum(@Param("organId") Integer organId);
     int getOrgansTotalEVipStudentNum(@Param("organIds") List<Integer> organIds);
-    List<Map<Integer, Integer>> getOrgansEVipStudentNum(@Param("organIds") List<Integer> organIds);
 
     List<Map<Integer, Integer>> getTeacherExperienceMemberStudentNum(@Param("teacherIds") List<Integer> teacherIds,
                                                                      @Param("organId") Integer organId);

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

@@ -83,7 +83,7 @@ public interface StudentExtracurricularExercisesSituationDao extends BaseDAO<Lon
      * @param sunday:
      * @return int
      */
-    int findLastWeekTodayUpdateNum(@Param("sunday") String sunday);
+    int findLastWeekTodayUpdateNum(@Param("sunday") String sunday,@Param("tenantId") Integer tenantId);
 
     /**
      * @describe 获取学生指定星期的课外训练统计记录
@@ -112,7 +112,7 @@ public interface StudentExtracurricularExercisesSituationDao extends BaseDAO<Lon
      * @param monday:
      * @return int
      */
-    int countWeekServiceNum(@Param("monday") String monday);
+    int countWeekServiceNum(@Param("monday") String monday, @Param("tenantId") Integer tenantId);
 
     /**
      * @describe 获取指定周指定学员的服务指标

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

@@ -57,7 +57,7 @@ public interface StudentGoodsSellDao extends BaseDAO<Integer, StudentGoodsSell>
      * @param autoAffirmReceiveTime:
      * @return java.util.List<java.lang.String>
      */
-    String queryNoAffirmOrderNo(@Param("autoAffirmReceiveTime") String autoAffirmReceiveTime);
+    String queryNoAffirmOrderNo(@Param("autoAffirmReceiveTime") String autoAffirmReceiveTime, @Param("tenantid") Integer tenantid);
 
     /**
      * @describe 自动确认收货

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

@@ -68,7 +68,7 @@ public interface StudentInstrumentDao extends BaseDAO<Long, StudentInstrument> {
      * @param organId
      * @return
      */
-    List<StudentInstrumentExportDto> getInstruments(@Param("startTime") Date startTime, @Param("endTime") Date endTime, @Param("organId") String organId);
+    List<StudentInstrumentExportDto> getInstruments(@Param("startTime") Date startTime, @Param("endTime") Date endTime, @Param("organId") String organId, @Param("tenantId") Integer tenantId);
 
     /**
      * 获取学生的乐团信息

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

@@ -120,13 +120,6 @@ public interface StudentPaymentOrderDao extends BaseDAO<Long, StudentPaymentOrde
                                                 @Param("status") DealStatusEnum status);
 
     /**
-     * 查找支付成功和支付中订单
-     *
-     * @return
-     */
-    int findPayOrderNum();
-
-    /**
      * 获取学员报名时所购买的商品
      *
      * @param musicGroupId
@@ -210,8 +203,6 @@ public interface StudentPaymentOrderDao extends BaseDAO<Long, StudentPaymentOrde
     List<Map<Long, BigDecimal>> queryExpectAmount(@Param("paymentOrderNo") List<Long> paymentOrderNo);
 
 
-    List<StudentPaymentOrder> findFixOrder();
-
     /**
      * 订单导出
      *
@@ -236,7 +227,7 @@ public interface StudentPaymentOrderDao extends BaseDAO<Long, StudentPaymentOrde
      */
     int countSporadicPage(Map<String, Object> params);
 
-    List<OrderStatisDto> getLuckStatis();
+    List<OrderStatisDto> getLuckStatis(Integer tenantId);
 
     /**
      * 统计收入信息

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

@@ -385,7 +385,7 @@ public interface StudentRegistrationDao extends BaseDAO<Long, StudentRegistratio
      *
      * @return
      */
-    List<OrderStatisDto> getOrganNormalStudent();
+    List<OrderStatisDto> getOrganNormalStudent(Integer tenantId);
 
     /**
      * @param userIds:
@@ -671,7 +671,7 @@ public interface StudentRegistrationDao extends BaseDAO<Long, StudentRegistratio
      * @param pushMemberRenew
      * @return
      */
-    List<Map<String,String>> queryAutoCreateStudentMap(@Param("pushMemberRenew") String pushMemberRenew);
+    List<Map<String,String>> queryAutoCreateStudentMap(@Param("pushMemberRenew") String pushMemberRenew, @Param("tenantId") Integer tenantId);
 
     /**
      * @describe 查询学员乐团名称字典
@@ -690,19 +690,7 @@ public interface StudentRegistrationDao extends BaseDAO<Long, StudentRegistratio
      * 获取进行中在读的学员列表
      * @return
      */
-    List<Integer> findStudentIds();
-
-    /**
-     * 获取有会员团的学员
-     * @return
-     */
-    List<Integer> queryHasMemberGroupStudent();
-
-    /**
-     * 获取云教练活动分部目标
-     * @return
-     */
-    List<CloudTeacherActiveTargetJsonDto> queryOrganTarget();
+    List<Integer> findStudentIds(Integer tenantId);
 
     /**
     * @description: 获取乐团在读学员乐保信息

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

@@ -15,7 +15,7 @@ public interface SubjectGoodsMapperDao extends BaseDAO<Long, SubjectGoodsMapper>
      * @param goodsCategoryId
      * @param subjectIds
      */
-    void batchAdd(@Param("goodsCategoryId") Integer goodsCategoryId, @Param("subjectIds") List<Integer> subjectIds);
+    void batchAdd(@Param("goodsCategoryId") Integer goodsCategoryId, @Param("subjectIds") List<Integer> subjectIds, @Param("tenantId") Integer tenantId);
 
     /**
      * 删除科目与商品类型关联

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/MusicGroupTrainPlanSaveDto.java

@@ -35,6 +35,8 @@ public class MusicGroupTrainPlanSaveDto {
 	private Date courseClassTime;
 
 	private Boolean studentFlag = false;
+	
+	private Integer tenantId;
 
 	public Boolean getStudentFlag() {
 		return studentFlag;
@@ -115,4 +117,12 @@ public class MusicGroupTrainPlanSaveDto {
 	public void setMusicGroupId(String musicGroupId) {
 		this.musicGroupId = musicGroupId;
 	}
+
+	public Integer getTenantId() {
+		return tenantId;
+	}
+
+	public void setTenantId(Integer tenantId) {
+		this.tenantId = tenantId;
+	}
 }

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

@@ -86,7 +86,7 @@ public interface GoodsService extends BaseService<Integer, Goods> {
      * @date 2020.10.13
      * @return void
      */
-    void sellOrderBatchNoAllot();
+    void sellOrderBatchNoAllot(Integer tenantId);
 
     /**
      * @describe 扣减商品库存

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

@@ -27,7 +27,7 @@ public interface StudentCompetitionService extends BaseService<Long, StudentComp
      * @date 2020.11.10
      * @return void
      */
-    List<StudentCompetitionRankingDto> getWinnerList();
+    List<StudentCompetitionRankingDto> getWinnerList(Integer tenantId);
 
     StudentCompetition checkIsUpload(Integer userId);
 

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

@@ -76,13 +76,6 @@ public interface StudentPaymentOrderService extends BaseService<Long, StudentPay
     List<StudentPaymentOrder> queryByBatchNo(Integer userId, String batchNo, DealStatusEnum status);
 
     /**
-     * 查找支付成功和支付中订单
-     *
-     * @return
-     */
-    int findPayOrderNum();
-
-    /**
      * 查询支付中订单
      *
      * @param status

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

@@ -21,9 +21,9 @@ public interface StudentServeService {
      * @param :
      * @return void
      */
-    void exercisesSituationStatistics(String monday);
+    void exercisesSituationStatistics(String monday, Integer tenantId);
 
-    void exercisesSituationStatistics2(String monday, List<Integer> studentIds);
+    void exercisesSituationStatistics2(String monday, List<Integer> studentIds, Integer tenantId);
 
     /**
      * @describe

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

@@ -144,11 +144,6 @@ public interface StudentService extends BaseService<Integer, Student> {
     void cleanStudentCloudStudySequenceDays();
 
     /**
-     * 标记进行中乐团在读学员+VIP、网管有课学员总数（除弦乐声部、去重）
-     */
-    void remarkCountFlag();
-
-    /**
      * 云教练活动统计
      * @param organIds
      * @param queryInfo

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

@@ -249,10 +249,12 @@ public class ExtracurricularExercisesReplyServiceImpl extends BaseServiceImpl<Lo
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public void exercisesSituationStatistics2(String monday) {
+		Integer tenantId = TenantContextHolder.getTenantId();
+		
 		LocalDate nowDate = LocalDateTime.now(DateUtil.zoneId).toLocalDate();
 
 		if(nowDate.getDayOfWeek()==DayOfWeek.MONDAY){
-			int lastWeekTodayUpdateNum = studentExtracurricularExercisesSituationDao.findLastWeekTodayUpdateNum(nowDate.plusDays(-1).toString());
+			int lastWeekTodayUpdateNum = studentExtracurricularExercisesSituationDao.findLastWeekTodayUpdateNum(nowDate.plusDays(-1).toString(),tenantId);
 			if(lastWeekTodayUpdateNum<=0){
 				nowDate = nowDate.plusDays(-1);
 			}
@@ -264,7 +266,7 @@ public class ExtracurricularExercisesReplyServiceImpl extends BaseServiceImpl<Lo
 		LocalDate monDayDate = nowDate.with(DateUtil.weekFields.dayOfWeek(), DayOfWeek.MONDAY.getValue());
 		LocalDate sunDayDate = nowDate.with(DateUtil.weekFields.dayOfWeek(), DayOfWeek.SUNDAY.getValue());
 
-		List<Student> serviceStudents = studentDao.getServiceStudents();
+		List<Student> serviceStudents = studentDao.getServiceStudents(tenantId);
 		if(CollectionUtils.isEmpty(serviceStudents)){
 			return;
 		}

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

@@ -49,7 +49,7 @@ public class GoodsCategoryServiceImpl extends BaseServiceImpl<Integer, GoodsCate
 			goodsCategoryDao.insert(goodsCategory);
 		}
 		List<Integer> subjectIds = goodsCategory.getSubjectIds();
-		subjectGoodsMapperDao.batchAdd(goodsCategory.getId(),subjectIds);
+		subjectGoodsMapperDao.batchAdd(goodsCategory.getId(),subjectIds, goodsCategory.getTenantId());
 	}
 
 	@Override

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

@@ -22,6 +22,7 @@ import com.ym.mec.biz.dal.page.GoodsQueryInfo;
 import com.ym.mec.biz.service.*;
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.util.collection.MapUtil;
+
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.ss.usermodel.PictureData;
 import org.slf4j.Logger;
@@ -54,6 +55,7 @@ import com.ym.mec.common.entity.UploadReturnBean;
 import com.ym.mec.common.exception.BizException;
 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.excel.POIUtil;
 import com.ym.mec.util.ini.IniFileUtil;
@@ -136,7 +138,7 @@ public class GoodsServiceImpl extends BaseServiceImpl<Integer, Goods>  implement
 		goodsProcurement.setGoodsCategoryId(existsGood.getGoodsCategoryId());
 		goodsProcurementDao.insert(goodsProcurement);
 
-		sellOrderBatchNoAllot();
+		sellOrderBatchNoAllot(existsGood.getTenantId());
 	}
 
 	@Override
@@ -427,7 +429,7 @@ public class GoodsServiceImpl extends BaseServiceImpl<Integer, Goods>  implement
 		}
 		goodsProcurementDao.batchInsert(goodsProcurements);
 
-		sellOrderBatchNoAllot();
+		sellOrderBatchNoAllot(TenantContextHolder.getTenantId());
 
 		return goodsList;
 	}
@@ -468,8 +470,8 @@ public class GoodsServiceImpl extends BaseServiceImpl<Integer, Goods>  implement
 
 	@Override
 	@Transactional(rollbackFor = Exception.class, isolation = Isolation.READ_COMMITTED)
-	public void sellOrderBatchNoAllot() {
-		List<Integer> noneBatchNoSellOrderIds = sellOrderDao.getNoneBatchNoSellOrderIds();
+	public void sellOrderBatchNoAllot(Integer tenantId) {
+		List<Integer> noneBatchNoSellOrderIds = sellOrderDao.getNoneBatchNoSellOrderIds(tenantId);
 		if(CollectionUtils.isEmpty(noneBatchNoSellOrderIds)){
 			return;
 		}

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

@@ -327,8 +327,10 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 	@Transactional(rollbackFor = Exception.class)
 	public void indexBaseDataTask(String dayStr, Set<IndexDataType> dataTypes) {
 		LocalDate nowDate = LocalDate.now();
+		
+		Integer tenantId = TenantContextHolder.getTenantId();
 
-		List<Organization> allOrgans = organizationDao.findAllOrgans();
+		List<Organization> allOrgans = organizationDao.findAllOrgans(tenantId);
 		if(CollectionUtils.isEmpty(this.organIds.get())){
 			this.organIds.get().clear();
 			this.organIds.get().addAll(allOrgans.stream().map(Organization::getId).collect(Collectors.toSet()));
@@ -340,8 +342,6 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 
 		LocalDate day = LocalDate.parse(dayStr, DateUtil.dateFormatter);
 		LocalDate monday = day.with(DateUtil.weekFields.dayOfWeek(), DayOfWeek.MONDAY.getValue());
-		
-		Integer tenantId = TenantContextHolder.getTenantId();
 
 		//学员数据
 		if(CollectionUtils.isEmpty(dataTypes)||dataTypes.contains(IndexDataType.STUDENT_REGISTRATION_NUM)){
@@ -563,7 +563,7 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 
 		//云教练新用户人数
 		if(CollectionUtils.isEmpty(dataTypes)||dataTypes.contains(IndexDataType.CLOUD_NEW_STUDENT_NUM)) {
-			List<Integer> studentIdList = studentRegistrationDao.findStudentIds();
+			List<Integer> studentIdList = studentRegistrationDao.findStudentIds(tenantId);
 			saveData(studentDao.groupOrganId(null,studentIdList),LocalDate.now().toString(),IndexDataType.CLOUD_NEW_STUDENT_NUM);
 		}
 
@@ -1308,7 +1308,7 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 	@Override
 	public PageInfo<EduOrganStudentDataDto> organStudentOverView(List<Integer> organIds, OrganCloudStudyStudentDataQueryInfo queryInfo) {
 		PageInfo<EduOrganStudentDataDto> pageInfo = new PageInfo<>(queryInfo.getPage(), queryInfo.getRows());
-		List<Organization> organs = organizationDao.getOrgans(organIds);
+		List<Organization> organs = organizationDao.getOrgans(organIds, queryInfo.getTenantId());
 		pageInfo.setTotal(organs.size());
 
 		if(CollectionUtils.isEmpty(organs)){

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

@@ -173,7 +173,7 @@ public class MusicGroupSchoolTermCourseDetailServiceImpl extends BaseServiceImpl
 		String remindCourseTime = sysTenantConfigService.getTenantConfigValue(SysConfigService.REMIND_COURSE_TIME,tenantId);
 		if(StringUtils.isNotEmpty(remindCourseTime)){
 			//获取当前学期截止前14天的乐团，并提醒教务老师排课
-			List<String> musicGroupIds = musicGroupSchoolTermCourseDetailDao.queryPushCourseTermMusicIds(remindCourseTime);
+			List<String> musicGroupIds = musicGroupSchoolTermCourseDetailDao.queryPushCourseTermMusicIds(remindCourseTime,tenantId);
 			if(musicGroupIds.size() > 0){
 				List<MusicGroup> musicGroupList = musicGroupDao.getMusicGroupByIds(musicGroupIds);
 				List<Integer> educationIds = musicGroupList.stream().map(e -> e.getEducationalTeacherId()).collect(Collectors.toList());
@@ -210,7 +210,7 @@ public class MusicGroupSchoolTermCourseDetailServiceImpl extends BaseServiceImpl
 			memberName = memberRankSetting.getName();
 		}
 		if(StringUtils.isNotEmpty(pushMemberRenewAgain)){
-			List<Integer> studentIdList = studentDao.queryPushMemberRenew(pushMemberRenewAgain);
+			List<Integer> studentIdList = studentDao.queryPushMemberRenew(pushMemberRenewAgain, tenantId);
 			if(studentIdList.size() > 0){
 				Map<Integer, String> studentPhoneMap = MapUtil.convertMybatisMap(teacherDao.queryPhoneByIds(StringUtils.join(studentIdList,",")));
 				Map<Integer,String> userMap = new HashMap<>(studentIdList.size());
@@ -241,7 +241,7 @@ public class MusicGroupSchoolTermCourseDetailServiceImpl extends BaseServiceImpl
 		//会员结束前15天自动创建乐团续费（默认提前15天）
 		String autoCreateMemberRenew = sysTenantConfigService.getTenantConfigValue(SysConfigService.AUTO_CREATE_MEMBER_RENEW,tenantId);
 		if(StringUtils.isNotEmpty(autoCreateMemberRenew)){
-			Map<String,String> studentMusicMap = MapUtil.convertMybatisMap(studentRegistrationDao.queryAutoCreateStudentMap(autoCreateMemberRenew));
+			Map<String,String> studentMusicMap = MapUtil.convertMybatisMap(studentRegistrationDao.queryAutoCreateStudentMap(autoCreateMemberRenew, tenantId));
 			if(studentMusicMap.size() > 0){
 				for (String musicGroupId : studentMusicMap.keySet()) {
 					MusicGroup musicGroup = musicGroupDao.get(musicGroupId);

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

@@ -11,8 +11,10 @@ import com.ym.mec.biz.service.MusicGroupTrainPlanService;
 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 com.ym.mec.util.collection.MapUtil;
 import com.ym.mec.util.date.DateUtil;
+
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -179,6 +181,7 @@ public class MusicGroupTrainPlanServiceImpl extends BaseServiceImpl<Integer, Mus
 
 	@Override
 	public List<MusicGroupTrainPlan> queryPlan(MusicGroupTrainPlanSaveDto schoolTerm) {
+		schoolTerm.setTenantId(TenantContextHolder.getTenantId());
 		return musicGroupTrainPlanDao.queryPlan(schoolTerm);
 	}
 }

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

@@ -70,7 +70,7 @@ public class OperatingReportServiceImpl extends BaseServiceImpl<Integer, Operati
             organOperating.put(organFullJobResource.getOrganId(), operatingReport);
         }
         //1.2 初始化没有全职资源数的分部
-        List<Organization> organs = organizationDao.findAllOrgans();
+        List<Organization> organs = organizationDao.findAllOrgans(tenantId);
         for (Organization organ : organs) {
             if(organOperating.containsKey(organ.getId())) continue;
             OperatingReport operatingReport = new OperatingReport();
@@ -122,29 +122,29 @@ public class OperatingReportServiceImpl extends BaseServiceImpl<Integer, Operati
         }
 
         //3.1、乐团销售订单的统计
-        List<OperatingReport> reports = sellOrderDao.getMusicGroupMonthReport(startTime, endTime);
+        List<OperatingReport> reports = sellOrderDao.getMusicGroupMonthReport(startTime, endTime, tenantId);
         //乐团订单总收入的统计
-        reports.addAll(sellOrderDao.getMusicGroupIncome(startTime, endTime));
+        reports.addAll(sellOrderDao.getMusicGroupIncome(startTime, endTime, tenantId));
         //3.2、VIP、网管课订单的统计（关联学生注册取一条记录）
-        reports.addAll(sellOrderDao.getMusicVipPracticeMonthReport(startTime, endTime));
+        reports.addAll(sellOrderDao.getMusicVipPracticeMonthReport(startTime, endTime, tenantId));
         //3.3、外部添加订单销售
-        reports.addAll(sellOrderDao.getOutOrderMonthReport(startTime, endTime));
+        reports.addAll(sellOrderDao.getOutOrderMonthReport(startTime, endTime, tenantId));
         //外部添加订单销售总收入
-        reports.addAll(sellOrderDao.getOutOrderIncome(startTime, endTime));
+        reports.addAll(sellOrderDao.getOutOrderIncome(startTime, endTime, tenantId));
         //3.4、乐器维修
-        reports.addAll(sellOrderDao.getRepairGoodsSellGroupMonthReport(startTime, endTime));
-        reports.addAll(sellOrderDao.getRepairGoodsSellGroupIncome(startTime, endTime));
+        reports.addAll(sellOrderDao.getRepairGoodsSellGroupMonthReport(startTime, endTime, tenantId));
+        reports.addAll(sellOrderDao.getRepairGoodsSellGroupIncome(startTime, endTime, tenantId));
         //3.5、商品销售
-        reports.addAll(sellOrderDao.getGoodsSellGroupMonthReport(startTime, endTime));
+        reports.addAll(sellOrderDao.getGoodsSellGroupMonthReport(startTime, endTime, tenantId));
         //3.6、零星支付充值
-        reports.addAll(sellOrderDao.getRechargeMonthReport(startTime, endTime));
+        reports.addAll(sellOrderDao.getRechargeMonthReport(startTime, endTime, tenantId));
         //3.7、零星收费（不是充值部分的）
-        reports.addAll(sellOrderDao.getSporadicMonthReport(startTime, endTime));
+        reports.addAll(sellOrderDao.getSporadicMonthReport(startTime, endTime, tenantId));
         //3.8 声部更换的收入
-        reports.addAll(sellOrderDao.getSubjectChangeMonthReport(startTime, endTime));
-        reports.addAll(sellOrderDao.getSubjectChangeGroupIncome(startTime, endTime));
+        reports.addAll(sellOrderDao.getSubjectChangeMonthReport(startTime, endTime, tenantId));
+        reports.addAll(sellOrderDao.getSubjectChangeGroupIncome(startTime, endTime, tenantId));
         //3.9 退货部分的统计
-        reports.addAll(sellOrderDao.getRefundIncome(startTime, endTime));
+        reports.addAll(sellOrderDao.getRefundIncome(startTime, endTime, tenantId));
 
         updateFee(organOperating, cooperationOperating, reports);
 

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

@@ -85,7 +85,7 @@ public class ReplacementInstrumentCooperationServiceImpl extends BaseServiceImpl
     public PageInfo<ReplacementInstrumentCooperation> getPageList(ReplacementInstrumentCooperationQueryInfo queryInfo) {
         PageInfo<ReplacementInstrumentCooperation> pageInfo = queryPage(queryInfo);
         if (pageInfo.getRows().size() > 0) {
-            List<ReplacementInstrumentCooperation> replacementInstruments = replacementInstrumentCooperationDao.countAllReplacementsInfo();
+            List<ReplacementInstrumentCooperation> replacementInstruments = replacementInstrumentCooperationDao.countAllReplacementsInfo(queryInfo.getTenantId());
             for (ReplacementInstrumentCooperation row : pageInfo.getRows()) {
                 for (ReplacementInstrumentCooperation replacementInstrument : replacementInstruments) {
                     if (!row.getId().equals(replacementInstrument.getId())) continue;

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

@@ -29,25 +29,25 @@ public class ResourceRespositoryServiceImpl extends BaseServiceImpl<Integer, Res
 			menuQueryInfo.setSubjectId(subjectId == 5?6:subjectId == 23?18:subjectId == 3?2:subjectId == 16?15:subjectId == 20?18:subjectId == 50?18:subjectId == 53?18
 					:subjectId == 54?18:subjectId == 55?18:subjectId == 56?18:subjectId == 60?18:subjectId == 8?4:subjectId);
 		}
-		List<ResourceRespository> resourceRespositories = resourceRespositoryDao.findList(menuQueryInfo.getParentId(),menuQueryInfo.getDelFlag(),menuQueryInfo.getSubjectId());
+		List<ResourceRespository> resourceRespositories = resourceRespositoryDao.findList(menuQueryInfo.getParentId(),menuQueryInfo.getDelFlag(),menuQueryInfo.getSubjectId(),menuQueryInfo.getTenantId());
 		for (ResourceRespository repository:resourceRespositories) {
-			repository = getTree(repository,menuQueryInfo.getDelFlag(),menuQueryInfo.getSubjectId());
+			repository = getTree(repository,menuQueryInfo.getDelFlag(),menuQueryInfo.getSubjectId(), menuQueryInfo.getTenantId());
 		}
 		return resourceRespositories;
 	}
 
-	private ResourceRespository getTree(ResourceRespository repository, String delFlag,Integer subjectId){
+	private ResourceRespository getTree(ResourceRespository repository, String delFlag,Integer subjectId, Integer tenantId){
 		//得到根节点对象
 		//获取子节点list
 		List<ResourceRespository> repositories = null;
-		repositories = resourceRespositoryDao.findList(repository.getId(),delFlag,subjectId);
+		repositories = resourceRespositoryDao.findList(repository.getId(),delFlag,subjectId,tenantId);
 		//如果存在子节点
 		if(repositories != null && repositories.size() > 0) {
 			//将子节点list放入父节点对象
 			repository.setRepositories(repositories);
 			//遍历子节点....
 			for (ResourceRespository sysMenu : repositories) {
-				getTree(sysMenu,delFlag,subjectId);
+				getTree(sysMenu,delFlag,subjectId,tenantId);
 			}
 		}
 		return repository;

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

@@ -7,11 +7,14 @@ 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.util.collection.MapUtil;
+
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+
 import com.ym.mec.biz.dal.entity.StudentCompetition;
 import com.ym.mec.biz.service.StudentCompetitionService;
 import com.ym.mec.biz.dal.dao.StudentCompetitionDao;
+
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Isolation;
 import org.springframework.transaction.annotation.Transactional;
@@ -76,8 +79,8 @@ public class StudentCompetitionServiceImpl extends BaseServiceImpl<Long, Student
 	}
 
 	@Override
-	public List<StudentCompetitionRankingDto> getWinnerList() {
-		List<StudentCompetition> winnerList = studentCompetitionDao.getWinnerList();
+	public List<StudentCompetitionRankingDto> getWinnerList(Integer tenantId) {
+		List<StudentCompetition> winnerList = studentCompetitionDao.getWinnerList(tenantId);
 		List<StudentCompetitionRankingDto> winnerSimpleInfoList = new ArrayList<>();
 		for (StudentCompetition studentCompetition : winnerList) {
 			winnerSimpleInfoList.add(new StudentCompetitionRankingDto(studentCompetition.getId(), studentCompetition.getPrizeLevel(), studentCompetition.getUsername(), studentCompetition.getPictureUrl()));
@@ -88,7 +91,7 @@ public class StudentCompetitionServiceImpl extends BaseServiceImpl<Long, Student
 	@Override
 	public void updateCompetition(StudentCompetition studentCompetition) {
 		if(Objects.nonNull(studentCompetition.getPrizeLevel())&&studentCompetition.getPrizeLevel()>0){
-			Set<Long> competitionsWithPrizeLevel = studentCompetitionDao.getCompetitionsWithPrizeLevel(studentCompetition.getPrizeLevel());
+			Set<Long> competitionsWithPrizeLevel = studentCompetitionDao.getCompetitionsWithPrizeLevel(studentCompetition.getPrizeLevel(),studentCompetition.getTenantId());
 			int maxPrizeLevelUserNum = 0;
 			switch (studentCompetition.getPrizeLevel()){
 				case 1:

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

@@ -93,7 +93,7 @@ public class StudentGoodsSellServiceImpl extends BaseServiceImpl<Integer, Studen
                 TenantInfo tenantInfo = tenantInfos.get(i);
                 String autoAffirmReceiveTime = sysTenantConfigService.getTenantConfigValue(SysConfigService.AUTO_AFFIRM_RECEIVE_TIME,tenantInfo.getId());
                 //获取到期的订单编号
-                String s = studentGoodsSellDao.queryNoAffirmOrderNo(autoAffirmReceiveTime);
+                String s = studentGoodsSellDao.queryNoAffirmOrderNo(autoAffirmReceiveTime, tenantInfo.getId());
                 if(StringUtils.isNotEmpty(s)){
                     sb.append(s).append(",");
                 }

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

@@ -210,11 +210,6 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
 		return studentPaymentOrderDao.queryByBatchNo(userId, batchNo, status);
 	}
 
-	@Override
-    public int findPayOrderNum() {
-        return studentPaymentOrderDao.findPayOrderNum();
-    }
-
     @Override
     public List<StudentPaymentOrder> findOrdersByStatus(DealStatusEnum status, String paymentChannel) {
         return studentPaymentOrderDao.findOrdersByStatus(status, paymentChannel);

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

@@ -57,10 +57,10 @@ public class StudentServeServiceImpl implements StudentServeService {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void exercisesSituationStatistics(String monday) {
+    public void exercisesSituationStatistics(String monday, Integer tenantId) {
         LocalDate nowDate = LocalDateTime.now(DateUtil.zoneId).toLocalDate();
 
-        int lastWeekTodayUpdateNum = studentExtracurricularExercisesSituationDao.findLastWeekTodayUpdateNum(nowDate.plusDays(-nowDate.getDayOfWeek().getValue()).toString());
+        int lastWeekTodayUpdateNum = studentExtracurricularExercisesSituationDao.findLastWeekTodayUpdateNum(nowDate.plusDays(-nowDate.getDayOfWeek().getValue()).toString(), tenantId);
         if(lastWeekTodayUpdateNum<=0){
             nowDate = nowDate.plusDays(-nowDate.getDayOfWeek().getValue());
         }
@@ -73,9 +73,9 @@ public class StudentServeServiceImpl implements StudentServeService {
         LocalDate sunDayDate = nowDate.with(DateUtil.weekFields.dayOfWeek(), DayOfWeek.SUNDAY.getValue());
         Date nextMonday = Date.from(sunDayDate.plusDays(1).atStartOfDay(DateUtil.zoneId).toInstant());
 
-        List<Integer> beServeStudentIds=studentDao.getServeStudentIds();
+        List<Integer> beServeStudentIds=studentDao.getServeStudentIds(tenantId);
         List<Integer> serveStudentIds=new ArrayList<>();
-        List<StudentServeCourseDto> serveStudentCourseStartTimes = studentDao.getServeStudentCourseStartTimes(monDayDate.toString());
+        List<StudentServeCourseDto> serveStudentCourseStartTimes = studentDao.getServeStudentCourseStartTimes(monDayDate.toString(),tenantId);
         Map<Integer, List<StudentServeCourseDto>> studentTimesMap = new HashMap<>();
         if(!CollectionUtils.isEmpty(serveStudentCourseStartTimes)){
             studentTimesMap = serveStudentCourseStartTimes.stream().collect(Collectors.groupingBy(StudentServeCourseDto::getStudentId));
@@ -298,11 +298,11 @@ public class StudentServeServiceImpl implements StudentServeService {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void exercisesSituationStatistics2(String monday, List<Integer> studentIds) {
+    public void exercisesSituationStatistics2(String monday, List<Integer> studentIds, Integer tenantId) {
         LocalDate nowDate = LocalDateTime.now(DateUtil.zoneId).toLocalDate();
 
-        int preWeekServiceNum = studentExtracurricularExercisesSituationDao.countWeekServiceNum(nowDate.with(DateUtil.weekFields.dayOfWeek(), DayOfWeek.MONDAY.getValue()).plusDays(-7).toString());
-        int lastWeekTodayUpdateNum = studentExtracurricularExercisesSituationDao.findLastWeekTodayUpdateNum(nowDate.plusDays(-nowDate.getDayOfWeek().getValue()).toString());
+        int preWeekServiceNum = studentExtracurricularExercisesSituationDao.countWeekServiceNum(nowDate.with(DateUtil.weekFields.dayOfWeek(), DayOfWeek.MONDAY.getValue()).plusDays(-7).toString(), tenantId);
+        int lastWeekTodayUpdateNum = studentExtracurricularExercisesSituationDao.findLastWeekTodayUpdateNum(nowDate.plusDays(-nowDate.getDayOfWeek().getValue()).toString(), tenantId);
         if(preWeekServiceNum>0 && lastWeekTodayUpdateNum<=0){
             nowDate = nowDate.plusDays(-nowDate.getDayOfWeek().getValue());
         }
@@ -348,7 +348,7 @@ public class StudentServeServiceImpl implements StudentServeService {
         Set<Integer> musicCourseStudentIds = studentFutureCourseInfo.stream().filter(s -> CourseSchedule.CourseScheduleType.SINGLE.equals(s.getType()) || CourseSchedule.CourseScheduleType.MIX.equals(s.getType())).map(StudentServeCourseDto::getStudentId).collect(Collectors.toSet());
 
         Set<Integer> haveCourseBeServeStudentIds = studentCourseMap.keySet();
-        List<Integer> allServeStudentIds = studentDao.getServeStudentIds();
+        List<Integer> allServeStudentIds = studentDao.getServeStudentIds(tenantId);
         Set<Integer> noCourseServeStudentIds = allServeStudentIds.stream().filter(id -> !haveCourseBeServeStudentIds.contains(id)).collect(Collectors.toSet());
 
         Set<Integer> musicStudentIds = new HashSet<>();

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

@@ -739,7 +739,7 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
 
     @Override
     public List<EduOrganStudentDataDto> organStudentOverView(List<Integer> organIds) {
-        List<Organization> organs = organizationDao.getOrgans(organIds);
+        List<Organization> organs = organizationDao.getOrgans(organIds,TenantContextHolder.getTenantId());
 
         if(CollectionUtils.isEmpty(organs)){
             return Collections.emptyList();
@@ -849,7 +849,7 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
         List<CloudTeacherActiveTargetDto> targetDtoList = JSONArray.parseArray(cloudTeacherActiveTarget, CloudTeacherActiveTargetDto.class);
         Map<Integer, List<CloudTeacherActiveTargetDto>> targetMap = targetDtoList.stream().collect(Collectors.groupingBy(e -> e.getOrganId()));
 
-        List<Organization> organs = organizationDao.getOrgans(organIds);
+        List<Organization> organs = organizationDao.getOrgans(organIds, queryInfo.getTenantId());
         pageInfo.setTotal(organs.size());
 
         if(CollectionUtils.isEmpty(organs)){
@@ -1042,24 +1042,6 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
     }
 
     @Override
-    public void remarkCountFlag() {
-        //清除标记
-        studentDao.cleanCountFlag();
-        //打标记
-//        List<Integer> studentIds = new ArrayList<>();
-        //获取在会员团的学员
-//        studentIds.addAll(studentRegistrationDao.queryHasMemberGroupStudent());
-        //获取购买过云教练（非活动）的学员
-//        studentIds.addAll(cloudTeacherOrderDao.getStudentIds());
-        //标记目标学员
-        studentDao.remarkCountFlag();
-        //更新目标学员、目标金额
-        SysConfig config = sysConfigDao.findByParamName("cloud_teacher_active_target");
-        config.setParanValue(JSON.toJSONString(studentRegistrationDao.queryOrganTarget()));
-        sysConfigDao.update(config);
-    }
-
-    @Override
     public Map<String,Object> countCloudTeacherActive(List<Integer> organIdList, CloudTeacherActiveQueryInfo queryInfo) {
         Map<String, Object> params = new HashMap<String, Object>();
         MapUtil.populateMap(params, queryInfo);

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

@@ -9,6 +9,7 @@
     <resultMap type="com.ym.mec.biz.dal.entity.MusicGroupPaymentCalender" id="MusicGroupPaymentCalender">
         <result column="id_" property="id"/>
         <result column="music_group_id_" property="musicGroupId"/>
+        <result column="tenant_id_" property="tenantId"/>
         <result column="music_group_organization_course_settings_id_" property="musicGroupOrganizationCourseSettingId"/>
         <result column="pay_user_type_" property="payUserType" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="start_payment_date_" property="startPaymentDate"/>
@@ -51,7 +52,7 @@
 
     <!-- 全查询 -->
     <select id="findAll" resultMap="MusicGroupPaymentCalender">
-		SELECT * FROM music_group_payment_calender ORDER BY id_
+		SELECT * FROM music_group_payment_calender where tenant_id_ = #{tenantId} ORDER BY id_
 	</select>
 
     <!-- 向数据库增加一条记录 -->
@@ -63,14 +64,14 @@
         payment_pattern_,payment_type_,payment_amount_,batch_no_,audit_memo_,operator_,attribute1_,
          attribute2_,student_ids_,member_payment_amount_,member_rank_setting_id_,member_valid_date_
          ,original_member_payment_amount_,member_period_,member_optional_flag_,
-         music_repair_num_,music_repair_actual_price_,music_repair_optional_flag_,current_total_amount_,original_total_amount_)
+         music_repair_num_,music_repair_actual_price_,music_repair_optional_flag_,current_total_amount_,original_total_amount_,tenant_id_)
         VALUES(#{musicGroupId},#{musicGroupOrganizationCourseSettingId},#{payUserType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
         #{rejectReason},#{startPaymentDate},#{deadlinePaymentDate},#{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
         #{expectNum},#{actualNum},#{memo},#{isGiveMusicNetwork},now(),now(),
         #{paymentValidStartDate},#{paymentValidEndDate},#{paymentPattern},#{paymentType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
         #{paymentAmount},#{batchNo},#{auditMemo},#{operator},#{attribute1},#{attribute2},#{studentIds},
                #{memberPaymentAmount},#{memberRankSettingId},#{memberValidDate},#{originalMemberPaymentAmount},#{memberPeriod,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-               #{memberOptionalFlag},#{musicRepairNum},#{musicRepairActualPrice},#{musicRepairOptionalFlag},#{currentTotalAmount},#{originalTotalAmount})
+               #{memberOptionalFlag},#{musicRepairNum},#{musicRepairActualPrice},#{musicRepairOptionalFlag},#{currentTotalAmount},#{originalTotalAmount},#{tenantId})
     </insert>
 
     <insert id="batchInsert" parameterType="com.ym.mec.biz.dal.entity.MusicGroupPaymentCalender" useGeneratedKeys="true"
@@ -80,7 +81,7 @@
         actual_num_,memo_,is_give_music_network_,create_time_,update_time_,payment_valid_start_date_,payment_valid_end_date_,payment_pattern_,payment_amount_,
         payment_type_,batch_no_,audit_memo_,operator_,attribute1_,attribute2_,student_ids_,
          member_payment_amount_,member_rank_setting_id_,member_valid_date_,original_member_payment_amount_,member_period_
-        ,member_optional_flag_,music_repair_num_,music_repair_actual_price_,music_repair_optional_flag_,current_total_amount_,original_total_amount_)
+        ,member_optional_flag_,music_repair_num_,music_repair_actual_price_,music_repair_optional_flag_,current_total_amount_,original_total_amount_,tenant_id_)
         VALUES
         <foreach collection="list" item="item" index="index" separator=",">
         (#{item.musicGroupId},#{item.musicGroupOrganizationCourseSettingId},#{item.payUserType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{item.rejectReason},#{item.startPaymentDate},#{item.deadlinePaymentDate},#{item.status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
@@ -88,7 +89,7 @@
         #{item.paymentValidStartDate},#{item.paymentValidEndDate},#{item.paymentPattern},#{item.paymentAmount},#{item.paymentType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
         #{item.batchNo},#{item.auditMemo},#{item.operator},#{item.attribute1},#{item.attribute2},
          #{item.studentIds},#{item.memberPaymentAmount},#{item.memberRankSettingId},#{item.memberValidDate},#{item.originalMemberPaymentAmount},#{item.memberPeriod,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-            #{item.memberOptionalFlag},#{item.musicRepairNum},#{item.musicRepairActualPrice},#{item.musicRepairOptionalFlag},#{item.currentTotalAmount},#{item.originalTotalAmount})
+            #{item.memberOptionalFlag},#{item.musicRepairNum},#{item.musicRepairActualPrice},#{item.musicRepairOptionalFlag},#{item.currentTotalAmount},#{item.originalTotalAmount},#{tenantId})
         </foreach>
     </insert>
 
@@ -194,7 +195,7 @@
                 attribute2_ = #{attribute2},
             </if>
         </set>
-        WHERE id_ = #{id}
+        WHERE id_ = #{id} and tenant_id_ = #{tenantId}
     </update>
     
     <update id="batchUpdate" parameterType="com.ym.mec.biz.dal.entity.MusicGroupPaymentCalender">
@@ -277,7 +278,7 @@
 	                attribute2_ = #{item.attribute2},
 	            </if>
 	        </set>
-	        WHERE id_ = #{item.id}
+	        WHERE id_ = #{item.id} and tenant_id_ = #{item.tenantId}
 		</foreach>
     </update>
     <update id="cutCalenderExpectNum">
@@ -319,6 +320,7 @@
 
     <sql id="queryPageSql">
         <where>
+        	mgpc.tenant_id_ = #{tenantId}
             <if test="musicGroupId != null">
                 AND mgpc.music_group_id_ = #{musicGroupId}
             </if>
@@ -521,7 +523,7 @@
     </resultMap>
     <sql id="MusicGroupPaymentCalenderAuditDtoSql">
         <where>
-                mgpc.batch_no_ IS NOT NULL
+                mgpc.batch_no_ IS NOT NULL and mgpc.tenant_id_ = #{tenantId}
             <if test="paymentType != null">
                 AND mgpc.payment_type_ = #{paymentType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
             </if>

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

@@ -18,6 +18,7 @@
 		<result column="original_amount_" property="originalAmount" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
+        <result column="tenant_id_" property="tenantId"/>
 	</resultMap>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -27,15 +28,15 @@
 	
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="MusicGroupPaymentCalenderMember">
-		SELECT * FROM music_group_payment_calender_member ORDER BY id_
+		SELECT * FROM music_group_payment_calender_member where tenant_id_ = #{tenantId} ORDER BY id_
 	</select>
 	
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.MusicGroupPaymentCalenderMember" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
 		INSERT INTO music_group_payment_calender_member (calender_id_,name_,num_,period_,
-		member_rank_setting_id_,optional_flag_,actual_amount_,original_amount_,create_time_,update_time_)
+		member_rank_setting_id_,optional_flag_,actual_amount_,original_amount_,create_time_,update_time_,tenant_id_)
 		VALUES(#{calenderId},#{name},#{num},#{period,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{memberRankSettingId},#{optionalFlag},#{actualAmount},
-		       #{originalAmount},NOW(),NOW())
+		       #{originalAmount},NOW(),NOW(),#{tenantId})
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -66,7 +67,7 @@
 		name_ = #{name},
 		</if>
 		update_time_ = NOW()
-	</set> WHERE id_ = #{id}
+	</set> WHERE id_ = #{id} and tenant_id_ = #{tenantId}
 	</update>
 	
 	<!-- 根据主键删除一条记录 -->
@@ -79,11 +80,11 @@
 
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="MusicGroupPaymentCalenderMember" parameterType="map">
-		SELECT * FROM music_group_payment_calender_member ORDER BY id_ <include refid="global.limit"/>
+		SELECT * FROM music_group_payment_calender_member where tenant_id_ = #{tenantId} ORDER BY id_ <include refid="global.limit"/>
 	</select>
 	
 	<!-- 查询当前表的总记录数 -->
 	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM music_group_payment_calender_member
+		SELECT COUNT(*) FROM music_group_payment_calender_member  where tenant_id_ = #{tenantId}
 	</select>
 </mapper>

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

@@ -15,6 +15,7 @@
 		<result column="original_amount_" property="originalAmount" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
+        <result column="tenant_id_" property="tenantId"/>
 	</resultMap>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -24,13 +25,13 @@
 	
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="MusicGroupPaymentCalenderRepair">
-		SELECT * FROM music_group_payment_calender_repair ORDER BY id_
+		SELECT * FROM music_group_payment_calender_repair where tenant_id_ = #{tenantId} ORDER BY id_
 	</select>
 	
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.MusicGroupPaymentCalenderRepair" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		INSERT INTO music_group_payment_calender_repair (calender_id_,num_,optional_flag_,actual_amount_,original_amount_,create_time_,update_time_)
-		VALUES(#{calenderId},#{num},#{optionalFlag},#{actualAmount},#{originalAmount},NOW(),NOW())
+		INSERT INTO music_group_payment_calender_repair (calender_id_,num_,optional_flag_,actual_amount_,original_amount_,create_time_,update_time_,tenant_id_)
+		VALUES(#{calenderId},#{num},#{optionalFlag},#{actualAmount},#{originalAmount},NOW(),NOW(),#{tenantId})
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -52,7 +53,7 @@
 		original_amount_ = #{originalAmount},
 		</if>
 		update_time_ = NOW()
-	</set> WHERE id_ = #{id}
+	</set> WHERE id_ = #{id} and tenant_id_ = #{tenantId}
 	</update>
 	
 	<!-- 根据主键删除一条记录 -->
@@ -65,11 +66,11 @@
 
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="MusicGroupPaymentCalenderRepair" parameterType="map">
-		SELECT * FROM music_group_payment_calender_repair ORDER BY id_ <include refid="global.limit"/>
+		SELECT * FROM music_group_payment_calender_repair where tenant_id_ = #{tenantId} ORDER BY id_ <include refid="global.limit"/>
 	</select>
 	
 	<!-- 查询当前表的总记录数 -->
 	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM music_group_payment_calender_repair
+		SELECT COUNT(*) FROM music_group_payment_calender_repair where tenant_id_ = #{tenantId}
 	</select>
 </mapper>

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

@@ -20,6 +20,7 @@
 		<result column="batch_no_" property="batchNo" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
+        <result column="tenant_id_" property="tenantId"/>
 	</resultMap>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -29,15 +30,15 @@
 	
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="MusicGroupPaymentCalenderStudentDetail">
-		SELECT * FROM music_group_payment_calender_student_detail ORDER BY id_
+		SELECT * FROM music_group_payment_calender_student_detail where tenant_id_ = #{tenantId} ORDER BY id_
 	</select>
 	
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.MusicGroupPaymentCalenderStudentDetail" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
 		INSERT INTO music_group_payment_calender_student_detail (id_,user_id_,phone_,username_,course_original_price_,
-																 course_current_price_,course_type_,course_time_,class_group_id_,batch_no_,create_time_,update_time_,master_sub_course_price_)
+																 course_current_price_,course_type_,course_time_,class_group_id_,batch_no_,create_time_,update_time_,master_sub_course_price_,tenant_id_)
 		VALUES(#{id},#{userId},#{phone},#{username},#{courseOriginalPrice},#{courseCurrentPrice},
-			   #{courseType},#{courseTime},#{classGroupId},#{batchNo},NOW(),NOW(),#{masterSubCoursePrice})
+			   #{courseType},#{courseTime},#{classGroupId},#{batchNo},NOW(),NOW(),#{masterSubCoursePrice},#{tenantId})
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -74,7 +75,7 @@
 		username_ = #{username},
 		</if>
 		update_time_ = NOW()
-		</set> WHERE id_ = #{id}
+		</set> WHERE id_ = #{id} and tenant_id_ = #{tenantId}
 	</update>
 	
 	<!-- 根据主键删除一条记录 -->
@@ -84,20 +85,20 @@
 	
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="MusicGroupPaymentCalenderStudentDetail" parameterType="map">
-		SELECT * FROM music_group_payment_calender_student_detail ORDER BY id_ <include refid="global.limit"/>
+		SELECT * FROM music_group_payment_calender_student_detail where tenant_id_ = #{tenantId} ORDER BY id_ <include refid="global.limit"/>
 	</select>
 	
 	<!-- 查询当前表的总记录数 -->
 	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM music_group_payment_calender_student_detail
+		SELECT COUNT(*) FROM music_group_payment_calender_student_detail where tenant_id_ = #{tenantId}
 	</select>
 	<insert id="batchInsert">
 		INSERT INTO music_group_payment_calender_student_detail (user_id_,phone_,username_,course_original_price_,
-		course_current_price_,course_type_,course_time_,class_group_id_,batch_no_,create_time_,update_time_,master_sub_course_price_)
+		course_current_price_,course_type_,course_time_,class_group_id_,batch_no_,create_time_,update_time_,master_sub_course_price_,tenant_id_)
 		VALUES
 		<foreach collection="musicGroupPaymentCalenderStudentDetails" item="item" index="index" separator=",">
 			(#{item.userId},#{item.phone},#{item.username},#{item.courseOriginalPrice},#{item.courseCurrentPrice},
-			#{item.courseType},#{item.courseTime},#{item.classGroupId},#{batchNo},NOW(),NOW(),#{item.masterSubCoursePrice})
+			#{item.courseType},#{item.courseTime},#{item.classGroupId},#{batchNo},NOW(),NOW(),#{item.masterSubCoursePrice},#{item.tenantId})
 		</foreach>
 	</insert>
 
@@ -113,7 +114,7 @@
 			</if>
 			update_time_ = NOW()
 		</set>
-			WHERE id_ = #{item.id}
+			WHERE id_ = #{item.id} and tenant_id_ = #{item.tenantId}
 		</foreach>
 	</update>
 	<update id="updateByCourseType">

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

@@ -15,6 +15,7 @@
 		<result column="memo_" property="memo" />
 		<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="MusicGroupPaymentEntities">
-		SELECT * FROM music_group_payment_entities ORDER BY id_
+		SELECT * FROM music_group_payment_entities where tenant_id_ = #{tenantId} ORDER BY id_
 	</select>
 	
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.MusicGroupPaymentEntities" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		INSERT INTO music_group_payment_entities (id_,music_group_id_,name_,payment_method_,amount_,memo_,create_time_,update_time_)
-		VALUES(#{id},#{musicGroupId},#{name},#{paymentMethod, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{amount},#{memo},now(),now())
+		INSERT INTO music_group_payment_entities (id_,music_group_id_,name_,payment_method_,amount_,memo_,create_time_,update_time_,tenant_id_)
+		VALUES(#{id},#{musicGroupId},#{name},#{paymentMethod, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{amount},#{memo},now(),now(),#{tenantId})
 	</insert>
     <insert id="batchAdd">
-		INSERT INTO music_group_payment_entities (music_group_id_,name_,payment_method_,amount_,memo_,create_time_,update_time_)
+		INSERT INTO music_group_payment_entities (music_group_id_,name_,payment_method_,amount_,memo_,create_time_,update_time_,tenant_id_)
 		VALUES
 		<foreach collection="entities" item="item" separator=",">
-			(#{musicGroupId},#{item.name},#{item.paymentMethod.code},#{item.amount},#{item.memo},now(),now())
+			(#{musicGroupId},#{item.name},#{item.paymentMethod.code},#{item.amount},#{item.memo},now(),now(),#{tenantId})
 		</foreach>
 	</insert>
 
@@ -63,7 +64,7 @@
 				name_ = #{name},
 			</if>
 		</set>
-		WHERE id_ = #{id}
+		WHERE id_ = #{id} and tenant_id_ = #{tenantId}
 	</update>
 	
 	<!-- 根据主键删除一条记录 -->
@@ -76,12 +77,12 @@
 
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="MusicGroupPaymentEntities" parameterType="map">
-		SELECT * FROM music_group_payment_entities ORDER BY id_ <include refid="global.limit"/>
+		SELECT * FROM music_group_payment_entities where tenant_id_ = #{tenantId} ORDER BY id_ <include refid="global.limit"/>
 	</select>
 	
 	<!-- 查询当前表的总记录数 -->
 	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM music_group_payment_entities
+		SELECT COUNT(*) FROM music_group_payment_entities  where tenant_id_ = #{tenantId}
 	</select>
     <select id="findByMusicGroupId" resultMap="MusicGroupPaymentEntities">
 		SELECT * FROM music_group_payment_entities WHERE music_group_id_ = #{musicGroupId}

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

@@ -18,6 +18,7 @@
         <result column="used_course_minutes_" property="usedCourseMinutes"/>
         <result column="create_time_" property="createTime"/>
         <result column="update_time_" property="updateTime"/>
+        <result column="tenant_id_" property="tenantId"/>
     </resultMap>
 
     <!-- 根据主键查询一条记录 -->
@@ -30,7 +31,7 @@
     <!-- 全查询 -->
     <select id="findAll" resultMap="MusicGroupPaymentStudentCourseDetail">
         SELECT *
-        FROM music_group_payment_student_course_detail
+        FROM music_group_payment_student_course_detail where tenant_id_ = #{tenantId}
         ORDER BY id_
     </select>
 
@@ -40,22 +41,22 @@
             useGeneratedKeys="true" keyColumn="id" keyProperty="id">
         INSERT INTO music_group_payment_student_course_detail
         (music_group_payment_calender_id_,music_group_payment_calender_detail_id_,user_id_,course_type_,
-         total_course_minutes_,used_course_minutes_,create_time_,update_time_,course_original_price_,course_current_price_)
+         total_course_minutes_,used_course_minutes_,create_time_,update_time_,course_original_price_,course_current_price_,tenant_id_)
         VALUES(#{musicGroupPaymentCalenderId},#{musicGroupPaymentCalenderDetailId},#{userId},
                #{courseType, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{totalCourseMinutes},#{usedCourseMinutes},
-               NOW(),NOW(),#{courseOriginalPrice},#{courseCurrentPrice})
+               NOW(),NOW(),#{courseOriginalPrice},#{courseCurrentPrice},#{tenantId})
     </insert>
 
     <insert id="batchInsert" parameterType="java.util.List" useGeneratedKeys="true" keyColumn="id"
             keyProperty="id">
         INSERT INTO music_group_payment_student_course_detail
         (music_group_payment_calender_id_,music_group_payment_calender_detail_id_,user_id_,
-         course_type_,total_course_minutes_,used_course_minutes_,create_time_,update_time_,course_original_price_,course_current_price_)
+         course_type_,total_course_minutes_,used_course_minutes_,create_time_,update_time_,course_original_price_,course_current_price_,tenant_id_)
         VALUES
         <foreach collection="list" item="item" separator=",">
             (#{item.musicGroupPaymentCalenderId},#{item.musicGroupPaymentCalenderDetailId},
              #{item.userId},#{item.courseType, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-             #{item.totalCourseMinutes},#{item.usedCourseMinutes},NOW(),NOW(),#{item.courseOriginalPrice},#{item.courseCurrentPrice})
+             #{item.totalCourseMinutes},#{item.usedCourseMinutes},NOW(),NOW(),#{item.courseOriginalPrice},#{item.courseCurrentPrice},#{item.tenantId})
         </foreach>
     </insert>
 
@@ -90,7 +91,7 @@
             </if>
                 update_time_ = NOW()
         </set>
-        WHERE id_ = #{id}
+        WHERE id_ = #{id} and tenant_id_ = #{tenantId}
     </update>
 
     <update id="batchUpdate"
@@ -124,7 +125,7 @@
                 </if>
                 update_time_ = NOW()
             </set>
-            WHERE id_ = #{paymentCourseDetail.id}
+            WHERE id_ = #{paymentCourseDetail.id} and tenant_id_ = #{paymentCourseDetail.tenantId}
         </foreach>
     </update>
     <update id="updateByCourseType">
@@ -171,14 +172,14 @@
     <!-- 分页查询 -->
     <select id="queryPage" resultMap="MusicGroupPaymentStudentCourseDetail"
             parameterType="map">
-        SELECT * FROM music_group_payment_student_course_detail ORDER BY id_
+        SELECT * FROM music_group_payment_student_course_detail where tenant_id_ = #{tenantId} ORDER BY id_
         <include refid="global.limit"/>
     </select>
 
     <!-- 查询当前表的总记录数 -->
     <select id="queryCount" resultType="int">
         SELECT COUNT(*)
-        FROM music_group_payment_student_course_detail
+        FROM music_group_payment_student_course_detail where tenant_id_ = #{tenantId}
     </select>
 
     <select id="getUnUseWithStudentAndCourseTypeAndCourseMinutes" resultMap="MusicGroupPaymentStudentCourseDetail">

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

@@ -20,6 +20,7 @@
 		<result column="organ_name_" property="organName" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
+        <result column="tenant_id_" property="tenantId"/>
 	</resultMap>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -29,13 +30,13 @@
 	
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="MusicGroupPerformance">
-		SELECT * FROM music_group_performance ORDER BY id_
+		SELECT * FROM music_group_performance where tenant_id_ = #{tenantId} ORDER BY id_
 	</select>
 	
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.MusicGroupPerformance" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		INSERT INTO music_group_performance (music_group_id_,name_,music_score_name_,operator_,order_,start_time_,create_time_,update_time_)
-		VALUES(#{musicGroupId},#{name},#{musicScoreName},#{operator},#{order},#{startTime},NOW(),NOW())
+		INSERT INTO music_group_performance (music_group_id_,name_,music_score_name_,operator_,order_,start_time_,create_time_,update_time_,tenant_id_)
+		VALUES(#{musicGroupId},#{name},#{musicScoreName},#{operator},#{order},#{startTime},NOW(),NOW(),#{tenantId})
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -60,7 +61,7 @@
 		start_time_ = #{startTime},
 		</if>
 		update_time_ = NOW()
-		</set> WHERE id_ = #{id}
+		</set> WHERE id_ = #{id} and tenant_id_ = #{tenantId}
 	</update>
 	
 	<!-- 根据主键删除一条记录 -->
@@ -73,6 +74,7 @@
 		SELECT mgp.*,su.real_name_ operator_name_ FROM music_group_performance mgp
 		LEFT JOIN sys_user su ON  su.id_ = mgp.operator_
 		<where>
+			mgp.tenant_id_ = #{tenantId}
 			<if test="musicGroupId != null and musicGroupId != ''">
 				AND mgp.music_group_id_ = #{musicGroupId}
 			</if>
@@ -85,6 +87,7 @@
 	<select id="queryCount" resultType="int">
 		SELECT COUNT(mgp.id_) FROM music_group_performance mgp
 		<where>
+			mgp.tenant_id_ = #{tenantId}
 			<if test="musicGroupId != null and musicGroupId != ''">
 				AND mgp.music_group_id_ = #{musicGroupId}
 			</if>
@@ -94,9 +97,7 @@
 		SELECT mgp.* FROM music_group_performance mgp
 		LEFT JOIN music_group mg ON mg.id_ = mgp.music_group_id_
 		WHERE DATEDIFF(DATE_FORMAT(start_time_, '%Y-%m-%d'),DATE_FORMAT(NOW(), '%Y-%m-%d')) >= 0
-		<if test="educationUserId != null">
 			AND mg.educational_teacher_id_ = #{educationUserId}
-		</if>
 		<if test="organIds != null and organIds != ''">
 			AND FIND_IN_SET(mg.organ_id_,#{organIds})
 		</if>
@@ -106,7 +107,7 @@
 		FROM music_group_performance mgp
 		LEFT JOIN music_group mg ON mg.id_ = mgp.music_group_id_
 		LEFT JOIN organization o ON o.id_ = mg.organ_id_
-		WHERE DATEDIFF(DATE_FORMAT(mgp.start_time_, '%Y-%m-%d'),DATE_FORMAT(NOW(), '%Y-%m-%d')) >= 0
+		WHERE DATEDIFF(DATE_FORMAT(mgp.start_time_, '%Y-%m-%d'),DATE_FORMAT(NOW(), '%Y-%m-%d')) >= 0 and mgp.tenant_id_ = #{tenantId}
 		<if test="educationUserId != null">
 			AND mg.educational_teacher_id_ = #{educationUserId}
 		</if>
@@ -121,7 +122,7 @@
 	<select id="countNoStart" resultType="java.lang.Integer">
 		SELECT COUNT(mgp.id_) FROM music_group_performance mgp
 		LEFT JOIN music_group mg ON mg.id_ = mgp.music_group_id_
-		WHERE DATEDIFF(DATE_FORMAT(start_time_, '%Y-%m-%d'),DATE_FORMAT(NOW(), '%Y-%m-%d')) >= 0
+		WHERE DATEDIFF(DATE_FORMAT(start_time_, '%Y-%m-%d'),DATE_FORMAT(NOW(), '%Y-%m-%d')) >= 0 and mgp.tenant_id_ = #{tenantId}
 		<if test="educationUserId != null">
 			AND mg.educational_teacher_id_ = #{educationUserId}
 		</if>

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

@@ -13,6 +13,7 @@
         <result column="purchase_num_" property="purchaseNum"/>
         <result column="create_time_" property="createTime"/>
         <result column="update_time_" property="updateTime"/>
+        <result column="tenant_id_" property="tenantId"/>
     </resultMap>
 
     <!-- 根据主键查询一条记录 -->
@@ -25,7 +26,7 @@
     <!-- 全查询 -->
     <select id="findAll" resultMap="MusicGroupPurchaseList">
         SELECT *
-        FROM music_group_purchase_list
+        FROM music_group_purchase_list where tenant_id_ = #{tenantId}
         ORDER BY id_
     </select>
 
@@ -37,8 +38,8 @@
         SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL
         </selectKey>
         -->
-        INSERT INTO music_group_purchase_list (id_,music_group_id_,goods_id_,purchase_num_,create_time_,update_time_)
-        VALUES(#{id},#{musicGroupId},#{goodsId},#{purchaseNum},now(),now())
+        INSERT INTO music_group_purchase_list (id_,music_group_id_,goods_id_,purchase_num_,create_time_,update_time_,tenant_id_)
+        VALUES(#{id},#{musicGroupId},#{goodsId},#{purchaseNum},now(),now(),#{tenantId})
     </insert>
 
     <!-- 根据主键查询一条记录 -->
@@ -58,7 +59,7 @@
                 goods_id_ = #{goodsId},
             </if>
         </set>
-        WHERE id_ = #{id}
+        WHERE id_ = #{id} and tenant_id_ = #{tenantId}
     </update>
 
     <!-- 根据主键删除一条记录 -->
@@ -72,8 +73,9 @@
     <select id="queryPage" resultMap="MusicGroupPurchaseList" parameterType="map">
         SELECT * FROM music_group_purchase_list
         <where>
+        	tenant_id_ = #{tenantId}
             <if test="musicGroupId != null">
-                music_group_id_ = #{musicGroupId}
+                and music_group_id_ = #{musicGroupId}
             </if>
         </where>
         ORDER BY id_
@@ -84,18 +86,19 @@
     <select id="queryCount" resultType="int">
         SELECT COUNT(*) FROM music_group_purchase_list
         <where>
+        	tenant_id_ = #{tenantId}
             <if test="musicGroupId != null">
-                music_group_id_ = #{musicGroupId}
+                and music_group_id_ = #{musicGroupId}
             </if>
         </where>
     </select>
 
     <insert id="batchInsert" parameterType="com.ym.mec.biz.dal.entity.MusicGroupPurchaseList" useGeneratedKeys="true"
             keyColumn="id" keyProperty="id">
-        INSERT INTO music_group_purchase_list (id_,music_group_id_,goods_id_,purchase_num_,create_time_,update_time_)
+        INSERT INTO music_group_purchase_list (id_,music_group_id_,goods_id_,purchase_num_,create_time_,update_time_,tenant_id_)
         VALUES
         <foreach collection="musicGroupPurchaseLists" item="item" index="index" separator=",">
-            (#{item.id},#{item.musicGroupId},#{item.goodsId},#{item.purchaseNum},now(),now())
+            (#{item.id},#{item.musicGroupId},#{item.goodsId},#{item.purchaseNum},now(),now(),#{item.tenantId})
         </foreach>
     </insert>
 

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

@@ -16,6 +16,7 @@
 		<result column="question_time_" property="questionTime" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
+        <result column="tenant_id_" property="tenantId"/>
 	</resultMap>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -27,13 +28,13 @@
 	
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="MusicGroupQuestionnaire">
-		SELECT * FROM music_group_questionnaire ORDER BY id_
+		SELECT * FROM music_group_questionnaire where tenant_id_ = #{tenantId} ORDER BY id_
 	</select>
 	
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.MusicGroupQuestionnaire" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		INSERT INTO music_group_questionnaire (questionnaire_topic_id_,music_group_id_,target_,operator_id_,question_time_,create_time_,update_time_)
-		VALUES(#{questionnaireTopicId},#{musicGroupId},#{target},#{operatorId},#{questionTime},NOW(),NOW())
+		INSERT INTO music_group_questionnaire (questionnaire_topic_id_,music_group_id_,target_,operator_id_,question_time_,create_time_,update_time_,tenant_id_)
+		VALUES(#{questionnaireTopicId},#{musicGroupId},#{target},#{operatorId},#{questionTime},NOW(),NOW(),#{tenantId})
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -73,6 +74,7 @@
 	</select>
 	<sql id="queryPageSql">
 		<where>
+			mgq.tenant_id_ = #{tenantId}
 			<if test="search != null and search != ''">
 				AND mgq.music_group_id_ = #{search}
 			</if>

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

@@ -6,6 +6,7 @@
     <resultMap type="com.ym.mec.biz.dal.entity.MusicGroupQuit"
                id="MusicGroupQuit">
         <result column="id_" property="id"/>
+        <result column="tenant_id_" property="tenantId"/>
         <result column="user_id_" property="userId"/>
         <result column="music_group_id_" property="musicGroupId"/>
         <result column="join_date_" property="joinDate"/>
@@ -40,7 +41,7 @@
     <!-- 全查询 -->
     <select id="findAll" resultMap="MusicGroupQuit">
         SELECT *
-        FROM music_group_quit
+        FROM music_group_quit where tenant_id_ = #{tenantId}
         ORDER BY id_
     </select>
 
@@ -48,9 +49,9 @@
     <insert id="insert" parameterType="com.ym.mec.biz.dal.entity.MusicGroupQuit"
             useGeneratedKeys="true" keyColumn="id" keyProperty="id">
         INSERT INTO music_group_quit
-        (id_,user_id_,music_group_id_,join_date_,quit_date_,create_time_,reason_,user_comment_,status_,apply_user_id_,is_visit_,visit_time_,fee_json_,current_approve_role_,return_total_fee_)
+        (id_,user_id_,music_group_id_,join_date_,quit_date_,create_time_,reason_,user_comment_,status_,apply_user_id_,is_visit_,visit_time_,fee_json_,current_approve_role_,return_total_fee_,tenant_id_)
         VALUES(#{id},#{userId},#{musicGroupId},#{joinDate},#{quitDate},#{createTime},#{reason},#{userComment},
-        #{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{applyUserId},#{isVisit},#{visitTime},#{feeJson},#{currentApproveRole},#{returnTotalFee})
+        #{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{applyUserId},#{isVisit},#{visitTime},#{feeJson},#{currentApproveRole},#{returnTotalFee},#{tenantId})
     </insert>
 
     <!-- 根据主键查询一条记录 -->
@@ -97,7 +98,7 @@
                 status_ = #{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
             </if>
         </set>
-        WHERE id_ = #{id}
+        WHERE id_ = #{id} and tenant_id_ = #{tenantId}
     </update>
 
     <!-- 根据主键删除一条记录 -->
@@ -121,6 +122,7 @@
     </select>
     <sql id="queryPageSql">
         <where>
+        	tenant_id_ = #{tenantId}
             <if test="ids != null and ids != ''">
                 AND FIND_IN_SET(mgq.id_,#{ids})
             </if>

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

@@ -16,6 +16,7 @@
 		<result column="total_course_time_" property="totalCourseTime" />
 		<result column="update_time_" property="updateTime" />
 		<result column="create_time_" property="createTime" />
+        <result column="tenant_id_" property="tenantId"/>
 	</resultMap>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -25,14 +26,14 @@
 	
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="MusicGroupSchoolTermCourseDetail">
-		SELECT * FROM music_group_school_term_course_detail ORDER BY id_
+		SELECT * FROM music_group_school_term_course_detail where tenant_id_ = #{tenantId} ORDER BY id_
 	</select>
 	
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.MusicGroupSchoolTermCourseDetail" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
 		INSERT INTO music_group_school_term_course_detail (music_group_id_,start_course_date_,start_school_term_,
-	   end_school_term_,course_flag_,total_course_time_,update_time_,create_time_)
-	   VALUES(#{musicGroupId},#{startCourseDate},#{startSchoolTerm},#{endSchoolTerm},#{courseFlag},#{totalCourseTime},NOW(),NOW())
+	   end_school_term_,course_flag_,total_course_time_,update_time_,create_time_,tenant_id_)
+	   VALUES(#{musicGroupId},#{startCourseDate},#{startSchoolTerm},#{endSchoolTerm},#{courseFlag},#{totalCourseTime},NOW(),NOW(),#{tenantId})
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -57,7 +58,7 @@
 			music_group_id_ = #{musicGroupId},
 		</if>
 			update_time_ = NOW()
-		</set> WHERE id_ = #{id}
+		</set> WHERE id_ = #{id} and tenant_id_ = #{tenantId}
 	</update>
 	
 	<!-- 根据主键删除一条记录 -->
@@ -67,12 +68,12 @@
 	
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="MusicGroupSchoolTermCourseDetail" parameterType="map">
-		SELECT * FROM music_group_school_term_course_detail ORDER BY id_ <include refid="global.limit"/>
+		SELECT * FROM music_group_school_term_course_detail where tenant_id_ = #{tenantId} ORDER BY id_ <include refid="global.limit"/>
 	</select>
 	
 	<!-- 查询当前表的总记录数 -->
 	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM music_group_school_term_course_detail
+		SELECT COUNT(*) FROM music_group_school_term_course_detail where tenant_id_ = #{tenantId}
 	</select>
 	<select id="findByMusicGroupId" resultMap="MusicGroupSchoolTermCourseDetail">
 		SELECT * FROM music_group_school_term_course_detail
@@ -93,7 +94,7 @@
 		WHERE course_flag_ = 0
 	</select>
     <select id="queryPushCourseTermMusicIds" resultType="java.lang.String">
-		SELECT music_group_id_ FROM music_group_school_term_course_detail
+		SELECT music_group_id_ FROM music_group_school_term_course_detail where tenant_id_ = #{tenantId}
 		GROUP BY music_group_id_ HAVING DATEDIFF(MAX(end_school_term_),NOW()) = #{remindCourseTime}
 	</select>
 </mapper>

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

@@ -16,6 +16,7 @@
 		<result column="single_course_minutes_" property="singleCourseMinutes" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
+        <result column="tenant_id_" property="tenantId"/>
 	</resultMap>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -25,22 +26,22 @@
 	
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="MusicGroupSchoolTermStudentCourseDetail">
-		SELECT * FROM music_group_school_term_student_course_detail ORDER BY id_
+		SELECT * FROM music_group_school_term_student_course_detail where tenant_id_ = #{tenantId} ORDER BY id_
 	</select>
 	
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.MusicGroupSchoolTermStudentCourseDetail" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
 		INSERT INTO music_group_school_term_student_course_detail
 		    (music_group_school_term_course_detail_id_,user_id_,member_course_minutes_,
-		   pre_member_course_minutes_,mix_course_minutes_,single_course_minutes_,create_time_,update_time_)
-		   VALUES(#{musicGroupSchoolTermCourseDetailId},#{userId},#{memberCourseMinutes},#{preMemberCourseMinutes},#{mixCourseMinutes},#{singleCourseMinutes},NOW(),NOW())
+		   pre_member_course_minutes_,mix_course_minutes_,single_course_minutes_,create_time_,update_time_,tenant_id_)
+		   VALUES(#{musicGroupSchoolTermCourseDetailId},#{userId},#{memberCourseMinutes},#{preMemberCourseMinutes},#{mixCourseMinutes},#{singleCourseMinutes},NOW(),NOW(),#{tenantId})
 	</insert>
 	<insert id="init">
 		INSERT INTO music_group_school_term_student_course_detail
-		(music_group_school_term_course_detail_id_,user_id_,member_course_minutes_,create_time_,update_time_)
+		(music_group_school_term_course_detail_id_,user_id_,member_course_minutes_,create_time_,update_time_,tenant_id_)
 		VALUES
 		<foreach collection="studentIds" item="userId" separator=",">
-			(#{studentCourseDetail.musicGroupSchoolTermCourseDetailId},#{userId},#{studentCourseDetail.memberCourseMinutes},NOW(),NOW())
+			(#{studentCourseDetail.musicGroupSchoolTermCourseDetailId},#{userId},#{studentCourseDetail.memberCourseMinutes},NOW(),NOW(),#{tenantId})
 		</foreach>
 	</insert>
 
@@ -66,7 +67,7 @@
 			pre_member_course_minutes_ = #{preMemberCourseMinutes},
 		</if>
 			update_time_ = NOW()
-		</set> WHERE id_ = #{id}
+		</set> WHERE id_ = #{id} and tenant_id_ = #{tenantId}
 	</update>
     <update id="updateMinutes">
 		UPDATE music_group_school_term_student_course_detail SET pre_member_course_minutes_ = #{preMemberCourseMinutes} + pre_member_course_minutes_,
@@ -105,12 +106,12 @@
 
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="MusicGroupSchoolTermStudentCourseDetail" parameterType="map">
-		SELECT * FROM music_group_school_term_student_course_detail ORDER BY id_ <include refid="global.limit"/>
+		SELECT * FROM music_group_school_term_student_course_detail where tenant_id_ = #{tenantId} ORDER BY id_ <include refid="global.limit"/>
 	</select>
 	
 	<!-- 查询当前表的总记录数 -->
 	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM music_group_school_term_student_course_detail
+		SELECT COUNT(*) FROM music_group_school_term_student_course_detail where tenant_id_ = #{tenantId}
 	</select>
 
 	<select id="getMixCourseMinutes" resultType="java.lang.Integer">

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

@@ -25,6 +25,7 @@
 		<result column="master_class_group_id_" property="masterClassGroupId" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
+        <result column="tenant_id_" property="tenantId"/>
 	</resultMap>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -34,17 +35,17 @@
 	
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="MusicGroupStudentClassAdjust">
-		SELECT * FROM music_group_student_class_adjust ORDER BY id_
+		SELECT * FROM music_group_student_class_adjust where tenant_id_ = #{tenantId} ORDER BY id_
 	</select>
 	
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.MusicGroupStudentClassAdjust" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
 		INSERT INTO music_group_student_class_adjust (music_group_id_,batch_no_,new_class_group_json_,
 		class_group_ids_,student_ids_,class_course_minute_,all_lock_course_ids_,sub_lock_course_ids_,
-		operator_id_,student_payment_ids_,class_group_students_,default_course_type_minute_,master_class_group_id_,master_class_course_times_,master_total_price_,create_time_,update_time_)
+		operator_id_,student_payment_ids_,class_group_students_,default_course_type_minute_,master_class_group_id_,master_class_course_times_,master_total_price_,create_time_,update_time_,tenant_id_)
 		VALUES(#{musicGroupId},#{batchNo},#{newClassGroupJson},#{classGroupIds},#{studentIds},
 		#{classCourseMinute},#{allLockCourseIds},#{subLockCourseIds},#{operatorId},#{studentPaymentIds},#{classGroupStudents},
-			   #{defaultCourseTypeMinute},#{masterClassGroupId},#{masterClassCourseTimes},#{masterTotalPrice},NOW(),NOW())
+			   #{defaultCourseTypeMinute},#{masterClassGroupId},#{masterClassCourseTimes},#{masterTotalPrice},NOW(),NOW(),#{tenantId})
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -93,7 +94,7 @@
 		music_group_id_ = #{musicGroupId},
 		</if>
 		update_time_ = NOW()
-		</set> WHERE id_ = #{id}
+		</set> WHERE id_ = #{id} and tenant_id_ = #{tenantId}
 	</update>
 	
 	<!-- 根据主键删除一条记录 -->
@@ -103,12 +104,12 @@
 	
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="MusicGroupStudentClassAdjust" parameterType="map">
-		SELECT * FROM music_group_student_class_adjust ORDER BY id_ <include refid="global.limit"/>
+		SELECT * FROM music_group_student_class_adjust where tenant_id_ = #{tenantId} ORDER BY id_ <include refid="global.limit"/>
 	</select>
 	
 	<!-- 查询当前表的总记录数 -->
 	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM music_group_student_class_adjust
+		SELECT COUNT(*) FROM music_group_student_class_adjust where tenant_id_ = #{tenantId}
 	</select>
     <select id="findByBatchNo" resultMap="MusicGroupStudentClassAdjust">
 		SELECT * FROM music_group_student_class_adjust WHERE FIND_IN_SET(#{batchNo},batch_no_)

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

@@ -8,6 +8,7 @@
 
     <resultMap type="com.ym.mec.biz.dal.entity.MusicGroupStudentFee" id="MusicGroupStudentFee">
         <result column="id_" property="id"/>
+        <result column="tenant_id_" property="tenantId"/>
         <result column="music_group_id_" property="musicGroupId"/>
         <result column="user_id_" property="userId"/>
         <result column="subject_id_" property="subjectId"/>
@@ -36,7 +37,7 @@
 
     <!-- 全查询 -->
     <select id="findAll" resultMap="MusicGroupStudentFee">
-		SELECT * FROM music_group_student_fee_ ORDER BY id_
+		SELECT * FROM music_group_student_fee_ where tenant_id_ = #{tenantId} ORDER BY id_
 	</select>
 
     <!-- 向数据库增加一条记录 -->
@@ -44,19 +45,19 @@
             keyColumn="id" keyProperty="id">
 		INSERT INTO music_group_student_fee_ (id_,music_group_id_,user_id_,course_fee_,create_time_,
 		update_time_,next_payment_date_,latest_paid_time_,continuous_absenteeism_times_,subject_id_,
-		payment_status_,temporary_course_fee_,payment_period_list_,remain_network_class_times_)
+		payment_status_,temporary_course_fee_,payment_period_list_,remain_network_class_times_,tenant_id_)
 		VALUES(#{id},#{musicGroupId},#{userId},#{courseFee},now(),now(),#{nextPaymentDate},#{latestPaidTime},
 		#{continuousAbsenteeismTimes},#{subjectId},#{paymentStatus,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-		#{temporaryCourseFee},#{paymentPeriodList},#{remainNetworkClassTimes})
+		#{temporaryCourseFee},#{paymentPeriodList},#{remainNetworkClassTimes},#{tenantId})
 	</insert>
 
     <insert id="batchInsert" parameterType="com.ym.mec.biz.dal.entity.MusicGroupStudentFee">
         INSERT INTO music_group_student_fee_ (music_group_id_,user_id_,create_time_,update_time_,next_payment_date_,
-        subject_id_,payment_status_,course_fee_,payment_period_list_,remain_network_class_times_)
+        subject_id_,payment_status_,course_fee_,payment_period_list_,remain_network_class_times_,tenant_id_)
 		VALUES
 		<foreach collection="musicGroupStudentFees" item="item" separator=",">
             (#{item.musicGroupId},#{item.userId},NOW(),NOW(),#{nextPaymentDate},#{item.subjectId},
-            #{paymentStatus},#{item.courseFee},#{item.paymentPeriodList},#{item.remainNetworkClassTimes})
+            #{paymentStatus},#{item.courseFee},#{item.paymentPeriodList},#{item.remainNetworkClassTimes},#{item.tenantId})
         </foreach>
     </insert>
 
@@ -104,7 +105,7 @@
                 payment_period_list_ = #{paymentPeriodList},
             </if>
         </set>
-        WHERE id_ = #{id}
+        WHERE id_ = #{id} and tenant_id_ = #{tenantId}
     </update>
     
     <update id="updateStudentAbsenteeismTimes">
@@ -180,12 +181,6 @@
         update music_group_student_fee_ set next_payment_date_ = #{nextPaymentDate},update_time_ = now() WHERE music_group_id_ = #{musicGroupId}
     </update>
 
-    <select id="queryWillRenewList" resultMap="MusicGroupStudentFee">
-        SELECT * FROM music_group_student_fee_
-        WHERE next_payment_date_ IS NOT NULL AND payment_status_ = 'PAID_COMPLETED'
-        and date_add(now(), interval #{days} day) >= next_payment_date_
-    </select>
-
     <select id="countContinuosAbsenteeismStudentNum" resultType="java.util.Map">
         SELECT
             music_group_id_ AS 'key',

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

@@ -20,6 +20,7 @@
         <result column="group_remission_course_fee_" property="groupRemissionCourseFee"/>
         <result column="kit_group_purchase_type_json_" property="kitGroupPurchaseTypeJson"/>
         <result column="course_purchase_type_json_" property="coursePurchaseTypeJson"/>
+        <result column="tenant_id_" property="tenantId"/>
     </resultMap>
 
     <!-- 根据主键查询一条记录 -->
@@ -31,7 +32,7 @@
     <!-- 全查询 -->
     <select id="findAll" resultMap="MusicGroupSubjectGoodsGroup">
         SELECT *
-        FROM music_group_subject_goods_group
+        FROM music_group_subject_goods_group where tenant_id_ = #{tenantId}
         ORDER BY id_
     </select>
 
@@ -40,16 +41,16 @@
             parameterType="com.ym.mec.biz.dal.entity.MusicGroupSubjectGoodsGroup"
             useGeneratedKeys="true" keyColumn="id" keyProperty="id">
         INSERT INTO music_group_subject_goods_group
-        (id_,name_,type_,music_group_id_,subject_id_,goods_id_list_,create_time_,update_time_,price_,deposit_fee_,remission_course_fee_,kit_group_purchase_type_json_,course_purchase_type_json_)
-        VALUES(#{id},#{name},#{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{musicGroupId},#{subjectId},#{goodsIdList},NOW(),NOW(),#{price},#{depositFee},#{remissionCourseFee},#{kitGroupPurchaseTypeJson},#{coursePurchaseTypeJson})
+        (id_,name_,type_,music_group_id_,subject_id_,goods_id_list_,create_time_,update_time_,price_,deposit_fee_,remission_course_fee_,kit_group_purchase_type_json_,course_purchase_type_json_,tenant_id_)
+        VALUES(#{id},#{name},#{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{musicGroupId},#{subjectId},#{goodsIdList},NOW(),NOW(),#{price},#{depositFee},#{remissionCourseFee},#{kitGroupPurchaseTypeJson},#{coursePurchaseTypeJson},#{tenantId})
     </insert>
 
     <insert id="batchInsert" parameterType="java.util.List">
         INSERT INTO music_group_subject_goods_group
-        (name_,type_,music_group_id_,subject_id_,goods_id_list_,create_time_,update_time_,price_,deposit_fee_,remission_course_fee_,group_remission_course_fee_,kit_group_purchase_type_json_,course_purchase_type_json_) VALUES
+        (name_,type_,music_group_id_,subject_id_,goods_id_list_,create_time_,update_time_,price_,deposit_fee_,remission_course_fee_,group_remission_course_fee_,kit_group_purchase_type_json_,course_purchase_type_json_,tenant_id_) VALUES
         <foreach collection="lists" item="item" index="index" separator=",">
             (#{item.name},#{item.type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-            #{musicGroupId},#{item.subjectId},#{item.goodsIdList},now(),now(),#{item.price},#{item.depositFee},#{item.remissionCourseFee},#{item.groupRemissionCourseFee},#{item.kitGroupPurchaseTypeJson},#{item.coursePurchaseTypeJson})
+            #{musicGroupId},#{item.subjectId},#{item.goodsIdList},now(),now(),#{item.price},#{item.depositFee},#{item.remissionCourseFee},#{item.groupRemissionCourseFee},#{item.kitGroupPurchaseTypeJson},#{item.coursePurchaseTypeJson},#{item.tenantId})
         </foreach>
     </insert>
 
@@ -89,7 +90,7 @@
                 name_ = #{name},
             </if>
         </set>
-        WHERE id_ = #{id}
+        WHERE id_ = #{id} and tenant_id_ = #{tenantId}
     </update>
 
     <!-- 根据主键删除一条记录 -->
@@ -103,14 +104,14 @@
     <!-- 分页查询 -->
     <select id="queryPage" resultMap="MusicGroupSubjectGoodsGroup"
             parameterType="map">
-        SELECT * FROM music_group_subject_goods_group ORDER BY id_
+        SELECT * FROM music_group_subject_goods_group where tenant_id_ = #{tenantId} ORDER BY id_
         <include refid="global.limit"/>
     </select>
 
     <!-- 查询当前表的总记录数 -->
     <select id="queryCount" resultType="int">
         SELECT COUNT(*)
-        FROM music_group_subject_goods_group
+        FROM music_group_subject_goods_group where tenant_id_ = #{tenantId}
     </select>
 
     <resultMap type="com.ym.mec.biz.dal.entity.MusicGroupSubjectGoodsGroup" extends="MusicGroupSubjectGoodsGroup" id="findGoodsGroupMap">

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

@@ -22,6 +22,7 @@
         <result column="update_time_" property="updateTime"/>
         <result column="version" property="version"/>
         <result column="sub_name_" property="subName"/>
+        <result column="tenant_id_" property="tenantId"/>
     </resultMap>
 
     <!-- 根据主键查询一条记录 -->
@@ -32,7 +33,7 @@
     <!-- 全查询 -->
     <select id="findAll" resultMap="MusicGroupSubjectPlan">
         SELECT *
-        FROM music_group_subject_plan
+        FROM music_group_subject_plan where tenant_id_ = #{tenantId}
         ORDER BY id_
     </select>
 
@@ -40,16 +41,16 @@
     <insert id="insert" parameterType="com.ym.mec.biz.dal.entity.MusicGroupSubjectPlan" useGeneratedKeys="true"
             keyColumn="id" keyProperty="id">
         INSERT INTO music_group_subject_plan
-        (id_,music_group_id_,subject_id_,expected_student_num_,apply_student_num_,fee_,kit_group_purchase_type_,deposit_fee_,create_time_,update_time_)
-        VALUES(#{id},#{musicGroupId},#{subjectId},#{expectedStudentNum},#{applyStudentNum},#{fee},#{kitGroupPurchaseType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{depositFee},now(),now())
+        (id_,music_group_id_,subject_id_,expected_student_num_,apply_student_num_,fee_,kit_group_purchase_type_,deposit_fee_,create_time_,update_time_,tenant_id_)
+        VALUES(#{id},#{musicGroupId},#{subjectId},#{expectedStudentNum},#{applyStudentNum},#{fee},#{kitGroupPurchaseType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{depositFee},now(),now(),#{tenantId})
     </insert>
     <insert id="batchAdd">
         INSERT INTO music_group_subject_plan
-        (music_group_id_,subject_id_,expected_student_num_,fee_,kit_group_purchase_type_,deposit_fee_,create_time_,update_time_)
+        (music_group_id_,subject_id_,expected_student_num_,fee_,kit_group_purchase_type_,deposit_fee_,create_time_,update_time_,tenant_id_)
         VALUES
         <foreach collection="subjectPlans" item="item" separator=",">
             (#{musicGroupId},#{item.subjectId},#{item.expectedStudentNum},#{item.fee},#{item.kitGroupPurchaseType},
-            #{item.depositFee},now(),now())
+            #{item.depositFee},now(),now(),#{tenantId})
         </foreach>
     </insert>
 
@@ -92,7 +93,7 @@
                 version = version+1,
             </if>
         </set>
-        WHERE id_ = #{id} AND version =#{version}
+        WHERE id_ = #{id} AND version =#{version} and tenant_id_ = #{tenantId}
     </update>
 
     <update id="updateExpectedStudentNum">
@@ -122,14 +123,14 @@
 
     <!-- 分页查询 -->
     <select id="queryPage" resultMap="MusicGroupSubjectPlan" parameterType="map">
-        SELECT * FROM music_group_subject_plan ORDER BY id_
+        SELECT * FROM music_group_subject_plan where tenant_id_ = #{tenantId} ORDER BY id_
         <include refid="global.limit"/>
     </select>
 
     <!-- 查询当前表的总记录数 -->
     <select id="queryCount" resultType="int">
         SELECT COUNT(*)
-        FROM music_group_subject_plan
+        FROM music_group_subject_plan where tenant_id_ = #{tenantId}
     </select>
 
     <!-- 查询乐团科目计划表 -->

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

@@ -16,6 +16,7 @@
 		<result column="end_school_term_" property="endSchoolTerm" />
 		<result column="update_time_" property="updateTime" />
 		<result column="create_time_" property="createTime" />
+        <result column="tenant_id_" property="tenantId"/>
 	</resultMap>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -27,6 +28,7 @@
 	<select id="findAll" resultMap="MusicGroupTrainPlan">
 		SELECT * FROM music_group_train_plan
 		<where>
+			tenant_id_ = #{tenantId}
 			<if test="classGroupId != null">
 				AND class_group_id_ = #{classGroupId}
 			</if>
@@ -45,6 +47,7 @@
 	<select id="findAllPlan" resultType="java.lang.String">
 		SELECT plan_ FROM music_group_train_plan
 		<where>
+			tenant_id_ = #{tenantId}
 			<if test="classGroupId != null">
 				AND class_group_id_ = #{classGroupId}
 			</if>
@@ -63,14 +66,14 @@
 	
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.MusicGroupTrainPlan" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		INSERT INTO music_group_train_plan (music_group_id_,class_group_id_,course_type_,plan_,start_school_term_,end_school_term_,update_time_,create_time_)
-		VALUES(#{musicGroupId},#{classGroupId},#{courseType},#{plan},#{startSchoolTerm},#{endSchoolTerm},NOW(),NOW())
+		INSERT INTO music_group_train_plan (music_group_id_,class_group_id_,course_type_,plan_,start_school_term_,end_school_term_,update_time_,create_time_,tenant_id_)
+		VALUES(#{musicGroupId},#{classGroupId},#{courseType},#{plan},#{startSchoolTerm},#{endSchoolTerm},NOW(),NOW(),#{tenantId})
 	</insert>
     <insert id="add">
-		INSERT INTO music_group_train_plan (music_group_id_,class_group_id_,course_type_,plan_,start_school_term_,end_school_term_,update_time_,create_time_)
+		INSERT INTO music_group_train_plan (music_group_id_,class_group_id_,course_type_,plan_,start_school_term_,end_school_term_,update_time_,create_time_,tenant_id_)
 		VALUES
 		<foreach collection="dto.plans" separator="," item="plan">
-			(#{dto.musicGroupId},#{dto.classGroupId},#{dto.courseScheduleType},#{plan},#{dto.startSchoolTerm},#{dto.endSchoolTerm},NOW(),NOW())
+			(#{dto.musicGroupId},#{dto.classGroupId},#{dto.courseScheduleType},#{plan},#{dto.startSchoolTerm},#{dto.endSchoolTerm},NOW(),NOW(),#{tenantId})
 		</foreach>
 	</insert>
 
@@ -96,7 +99,7 @@
 		music_group_id_ = #{musicGroupId},
 		</if>
 		update_time_ = NOW(),
-		</set> WHERE id_ = #{id}
+		</set> WHERE id_ = #{id} and tenant_id_ = #{tenantId}
 	</update>
 	
 	<!-- 根据主键删除一条记录 -->
@@ -106,12 +109,12 @@
 	
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="MusicGroupTrainPlan" parameterType="map">
-		SELECT * FROM music_group_train_plan ORDER BY id_ <include refid="global.limit"/>
+		SELECT * FROM music_group_train_plan where tenant_id_ = #{tenantId} ORDER BY id_ <include refid="global.limit"/>
 	</select>
 	
 	<!-- 查询当前表的总记录数 -->
 	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM music_group_train_plan
+		SELECT COUNT(*) FROM music_group_train_plan where tenant_id_ = #{tenantId}
 	</select>
 	<resultMap id="WaitCourseTrainPlanDto" type="com.ym.mec.biz.dal.dto.WaitCourseTrainPlanDto">
 		<result property="classGroupId" column="class_group_id_"/>
@@ -179,6 +182,7 @@
 	<select id="queryPlan" resultMap="MusicGroupTrainPlan">
 		SELECT * FROM music_group_train_plan
 		<where>
+			tenant_id_ = #{schoolTerm.tenantId}
 			<if test="schoolTerm.startSchoolTerm != null">
 				AND start_school_term_ = #{schoolTerm.startSchoolTerm}
 			</if>

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

@@ -22,13 +22,14 @@
         <result column="profit_" property="profit"/>
         <result column="month_" property="month"/>
         <result column="create_time_" property="createTime"/>
+        <result column="tenant_id_" property="tenantId"/>
     </resultMap>
     <sql id="Base_Column_List">
         <!--@mbg.generated-->
         id_, organ_id_, cooperation_organ_id_, sell_amount_, service_amount_,other_income_, refund_amount_,
         income_total_,
         sell_cost_, expenses_amount_, variable_cost_, distribution_amount_, cost_amount_,
-        profit_, month_, create_time_
+        profit_, month_, create_time_,tenant_id_
     </sql>
     <select id="get" parameterType="java.lang.Integer" resultMap="OperatingReport">
         <!--@mbg.generated-->
@@ -48,10 +49,10 @@
         insert into operating_report (organ_id_, cooperation_organ_id_, sell_amount_, service_amount_,other_income_,
         refund_amount_,
         income_total_, sell_cost_, expenses_amount_, variable_cost_, distribution_amount_,
-        cost_amount_, profit_, month_, create_time_)
+        cost_amount_, profit_, month_, create_time_,tenant_id_)
         values (#{organId}, #{cooperationOrganId}, #{sellAmount}, #{serviceAmount},#{otherIncome}, #{refundAmount},
         #{incomeTotal}, #{sellCost}, #{expensesAmount}, #{variableCost}, #{distributionAmount},
-        #{costAmount}, #{profit}, #{month}, #{createTime})
+        #{costAmount}, #{profit}, #{month}, #{createTime},#{tenantId})
     </insert>
 
     <update id="update" parameterType="com.ym.mec.biz.dal.entity.OperatingReport">
@@ -104,7 +105,7 @@
                 create_time_ = #{createTime},
             </if>
         </set>
-        where id_ = #{id}
+        where id_ = #{id} and tenant_id_ = #{tenantId}
     </update>
 
 
@@ -126,6 +127,7 @@
 
     <sql id="queryPageSql">
         <where>
+        	opr.tenant_id_ = #{tenantId}
             <if test="organIdList != null and organIdList != ''">
                 AND FIND_IN_SET(opr.organ_id_,#{organIdList})
             </if>
@@ -149,9 +151,7 @@
     <select id="getReport" resultMap="OperatingReport" parameterType="map">
         SELECT * FROM operating_report
         <where>
-            <if test="organId != null">
-                AND organ_id_ = #{organId}
-            </if>
+        	organ_id_ = #{organId}
             <if test="cooperationOrganId != null">
                 AND cooperation_organ_id_ = #{cooperationOrganId}
             </if>

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

@@ -10,6 +10,7 @@
         <result column="plus_price_" property="plusPrice"/>
         <result column="create_time_" property="createTime"/>
         <result column="update_time_" property="updateTime"/>
+        <result column="tenant_id_" property="tenantId"/>
         <result column="organName" property="organName"/>
     </resultMap>
 
@@ -23,7 +24,7 @@
     <!-- 全查询 -->
     <select id="findAll" resultMap="OrganizationCloudTeacherFee">
         SELECT *
-        FROM organization_cloud_teacher_fee
+        FROM organization_cloud_teacher_fee where tenant_id_ = #{tenantId}
         ORDER BY id_
     </select>
 
@@ -31,8 +32,8 @@
     <insert id="insert" parameterType="com.ym.mec.biz.dal.entity.OrganizationCloudTeacherFee"
             useGeneratedKeys="true" keyColumn="id_" keyProperty="id">
         INSERT INTO organization_cloud_teacher_fee
-            (organ_id_, price_,plus_price_, create_time_, update_time_)
-        VALUES (#{organId}, #{price},#{plusPrice}, NOW(), NOW())
+            (organ_id_, price_,plus_price_, create_time_, update_time_,tenant_id_)
+        VALUES (#{organId}, #{price},#{plusPrice}, NOW(), NOW(),#{tenantId})
     </insert>
 
     <!-- 根据主键查询一条记录 -->
@@ -47,7 +48,7 @@
             </if>
             update_time_=NOW()
         </set>
-        WHERE id_ = #{id}
+        WHERE id_ = #{id} and tenant_id_ = #{tenantId}
     </update>
 
     <!-- 根据主键删除一条记录 -->
@@ -74,6 +75,7 @@
 
     <sql id="queryPageSql">
         <where>
+        	octf.tenant_id_ = #{tenantId}
             <if test="organId != null">
                 AND FIND_IN_SET(octf.organ_id_,#{organId})
             </if>

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

@@ -11,6 +11,7 @@
         <result column="duration_" property="duration"/>
         <result column="create_time_" property="createTime"/>
         <result column="update_time_" property="updateTime"/>
+        <result column="tenant_id_" property="tenantId"/>
         <result column="organ_name_" property="organ.name"/>
     </resultMap>
 
@@ -24,7 +25,7 @@
     <!-- 全查询 -->
     <select id="findAll" resultMap="OrganizationCourseDurationSettings">
         SELECT *
-        FROM organization_course_duration_settings
+        FROM organization_course_duration_settings where tenant_id_ = #{tenantId}
         ORDER BY id_
     </select>
 
@@ -34,8 +35,8 @@
         <!-- <selectKey resultClass="int" keyProperty="id" > SELECT SEQ_WSDEFINITION_ID.nextval
             AS ID FROM DUAL </selectKey> -->
         INSERT INTO organization_course_duration_settings
-        (id_,organ_id_,course_type_,duration_,create_time_,update_time_)
-        VALUES(#{id},#{organId},#{courseType, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{duration},now(),now())
+        (id_,organ_id_,course_type_,duration_,create_time_,update_time_,tenant_id_)
+        VALUES(#{id},#{organId},#{courseType, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{duration},now(),now(),#{tenantId})
     </insert>
 
     <!-- 根据主键查询一条记录 -->
@@ -61,7 +62,7 @@
                 update_time_ = #{updateTime},
             </if>
         </set>
-        WHERE id_ = #{id}
+        WHERE id_ = #{id} and tenant_id_ = #{tenantId}
     </update>
 
     <!-- 根据主键删除一条记录 -->
@@ -76,6 +77,7 @@
         SELECT ocds.*,o.name_ organ_name_ FROM organization_course_duration_settings ocds
         LEFT JOIN organization o on ocds.organ_id_ = o.id_
         <where>
+        	ocds.tenant_id_ = #{tenantId}
             <if test="organId != null">
                 and ocds.organ_id_ = #{organId}
             </if>
@@ -91,6 +93,7 @@
     <select id="queryCount" resultType="int">
         SELECT COUNT(ups.id_) FROM organization_course_duration_settings ups
         <where>
+        	ups.tenant_id_ = #{tenantId}
             <if test="organId != null">
                 and ups.organ_id_ = #{organId}
             </if>

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

@@ -11,6 +11,7 @@
 		<result column="unit_price_" property="unitPrice" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
+        <result column="tenant_id_" property="tenantId"/>
 		<result column="organ_name_" property="organ.name" />
 		<result column="charge_type_name_" property="chargeType.name" />
 	</resultMap>
@@ -22,7 +23,7 @@
 
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="OrganizationCourseUnitPriceSettings">
-		SELECT * FROM organization_course_unit_price_settings ORDER BY id_
+		SELECT * FROM organization_course_unit_price_settings where tenant_id_ = #{tenantId} ORDER BY id_
 	</select>
 
 	<!-- 向数据库增加一条记录 -->
@@ -30,16 +31,16 @@
 		<!-- <selectKey resultClass="int" keyProperty="id" > SELECT SEQ_WSDEFINITION_ID.nextval 
 			AS ID FROM DUAL </selectKey> -->
 		INSERT INTO organization_course_unit_price_settings
-		(id_,organ_id_,course_type_,charge_type_id_,unit_price_,create_time_,update_time_)
-		VALUES(#{id},#{organId},#{courseType, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{chargeTypeId},#{unitPrice},now(),now())
+		(id_,organ_id_,course_type_,charge_type_id_,unit_price_,create_time_,update_time_,tenant_id_)
+		VALUES(#{id},#{organId},#{courseType, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{chargeTypeId},#{unitPrice},now(),now(),#{tenantId})
 	</insert>
 	
 	<insert id="batchInsert" parameterType="java.util.List" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
 		INSERT INTO organization_course_unit_price_settings
-		(id_,organ_id_,course_type_,charge_type_id_,unit_price_,create_time_,update_time_)
+		(id_,organ_id_,course_type_,charge_type_id_,unit_price_,create_time_,update_time_,tenant_id_)
 		VALUES
 		<foreach collection="list" item="item" separator=",">
-		(#{item.id},#{item.organId},#{item.courseType, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{item.chargeTypeId},#{item.unitPrice},now(),now())
+		(#{item.id},#{item.organId},#{item.courseType, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{item.chargeTypeId},#{item.unitPrice},now(),now(),#{tenantId})
 		</foreach>
 	</insert>
 
@@ -69,7 +70,7 @@
 				create_time_ = #{createTime},
 			</if>
 		</set>
-		WHERE id_ = #{id}
+		WHERE id_ = #{id} and tenant_id_ = #{tenantId}
 	</update>
 
 	<!-- 根据主键删除一条记录 -->
@@ -82,6 +83,7 @@
 		SELECT ups.*,o.name_ organ_name_ ,ct.name_ charge_type_name_ FROM organization_course_unit_price_settings ups left join organization o on ups.organ_id_ = o.id_
 		left join charge_type ct on ct.id_ = ups.charge_type_id_
 		<where>
+			ups.tenant_id_ = #{tenantId}
 			<if test="organId != null">
 				and ups.organ_id_ = #{organId}
 			</if>
@@ -100,6 +102,7 @@
 	<select id="queryCount" resultType="int">
 		SELECT COUNT(ups.id_) FROM organization_course_unit_price_settings ups
 		<where>
+			ups.tenant_id_ = #{tenantId}
 			<if test="organId != null">
 				and ups.organ_id_ = #{organId}
 			</if>

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

@@ -14,6 +14,7 @@
         <result column="theory_" property="theory"/>
         <result column="create_time_" property="createTime"/>
         <result column="update_time_" property="updateTime"/>
+        <result column="tenant_id_" property="tenantId"/>
     </resultMap>
     <select id="get" parameterType="java.lang.Integer" resultMap="OrganizationDegreeCourseFee">
         <!--@mbg.generated-->
@@ -30,9 +31,9 @@
             parameterType="com.ym.mec.biz.dal.entity.OrganizationDegreeCourseFee" useGeneratedKeys="true">
         <!--@mbg.generated-->
         insert into organization_degree_course_fee (organ_id_,original_vip_1v1_,original_vip_1v2_, vip_1v1_,
-        vip_1v2_,theory_, create_time_, update_time_)
+        vip_1v2_,theory_, create_time_, update_time_, tenant_id_)
         values (#{organId},#{originalVip1v1},#{originalVip1v2}, #{vip1v1},#{vip1v2}, #{theory}, #{createTime},
-        #{updateTime})
+        #{updateTime},#{tenantId})
     </insert>
     <update id="update" parameterType="com.ym.mec.biz.dal.entity.OrganizationDegreeCourseFee">
         <!--@mbg.generated-->
@@ -63,7 +64,7 @@
                 update_time_ = #{updateTime},
             </if>
         </set>
-        where id_ = #{id}
+        where id_ = #{id} and tenant_id_ = #{tenantId}
     </update>
 
     <select id="getByOrganId" resultMap="OrganizationDegreeCourseFee">

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

@@ -37,7 +37,7 @@
 
     <!-- 全查询 -->
     <select id="findAll" resultMap="Organization">
-		SELECT * FROM organization ORDER BY id_
+		SELECT * FROM organization where tenant_id_ = #{tenantId} ORDER BY id_
 	</select>
 
     <!-- 向数据库增加一条记录 -->
@@ -92,7 +92,7 @@
                 grade_type_ = #{gradeType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
             </if>
         </set>
-        WHERE id_ = #{id}
+        WHERE id_ = #{id} and tenant_id_ = #{tenantId}
     </update>
 
     <!-- 根据主键删除一条记录 -->
@@ -102,6 +102,7 @@
 
     <sql id="queryPageSql">
         <where>
+        	o.tenant_id_ = #{tenantId}
             <if test="delFlag != null">
                 and o.del_flag_ = #{delFlag,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
             </if>
@@ -138,9 +139,7 @@
         SELECT * FROM organization o
         <where>
             o.del_flag_ = 0
-            <if test="userId != null">
                 AND FIND_IN_SET(o.id_,(SELECT GROUP_CONCAT(organ_id_list_) FROM employee e WHERE e.user_id_ = #{userId}))
-            </if>
             <if test="organId != null and organId != ''">
                 AND FIND_IN_SET(o.id_,#{organId})
             </if>
@@ -163,7 +162,7 @@
     </select>
     
     <select id="findAllOrgans" resultMap="Organization">
-        SELECT * from organization where del_flag_=0 ORDER BY id_ ASC;
+        SELECT * from organization where del_flag_=0 and tenant_id_ = #{tenantId} ORDER BY id_ ASC;
     </select>
 
     <select id="findOrgans" resultMap="Organization">
@@ -175,7 +174,7 @@
 
     <select id="getOrgans" resultMap="Organization">
         SELECT * FROM organization
-        WHERE 1=1
+        WHERE tenant_id_ = #{tenantId}
          <if test="organIds!=null and organIds.size()>0">
              AND id_ IN
              <foreach collection="organIds" item="organId" separator="," open="(" close=")">
@@ -184,8 +183,4 @@
          </if>
     </select>
 
-    <select id="getActivityOrgans" resultMap="Organization">
-        SELECT o.* FROM practice_group_sell_price pgsp
-        LEFT JOIN organization o ON pgsp.organ_id_=o.id_
-    </select>
 </mapper>

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

@@ -15,6 +15,7 @@
         <result property="eventName" column="event_name_"/>
         <result property="pageName" column="page_name_"/>
         <result property="pageUrl" column="page_url_"/>
+        <result column="tenant_id_" property="tenantId"/>
     </resultMap>
 
     <!-- 根据主键查询一条记录 -->
@@ -24,7 +25,7 @@
 
     <!-- 全查询 -->
     <select id="findAll" resultMap="PageMonitor">
-		SELECT * FROM page_monitor ORDER BY id_
+		SELECT * FROM page_monitor where tenant_id_ = #{tenantId} ORDER BY id_
 	</select>
     <select id="findByUserIdAndEvent" resultMap="PageMonitor">
         SELECT * FROM page_monitor WHERE user_id_ = #{userId} AND event_ = #{event} LIMIT 1 FOR UPDATE
@@ -33,8 +34,8 @@
     <!-- 向数据库增加一条记录 -->
     <insert id="insert" parameterType="com.ym.mec.biz.dal.entity.PageMonitor" useGeneratedKeys="true" keyColumn="id"
             keyProperty="id">
-        INSERT INTO page_monitor (page_name_,page_url_,event_,event_name_,user_id_,times_,update_time_)
-        VALUES(#{pageName},#{pageUrl},#{event},#{eventName},#{userId},#{times},NOW())
+        INSERT INTO page_monitor (page_name_,page_url_,event_,event_name_,user_id_,times_,update_time_,tenant_id_)
+        VALUES(#{pageName},#{pageUrl},#{event},#{eventName},#{userId},#{times},NOW(),#{tenantId})
     </insert>
 
     <!-- 根据主键查询一条记录 -->
@@ -63,6 +64,6 @@
                 update_time_ = #{updateTime}
             </if>
         </set>
-        WHERE id_ = #{id}
+        WHERE id_ = #{id} and tenant_id_ = #{tenantId}
     </update>
 </mapper>

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

@@ -18,6 +18,7 @@
 		<result column="time_line_" property="timeLine" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
+        <result column="tenant_id_" property="tenantId"/>
 	</resultMap>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -27,14 +28,14 @@
 	
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="PhotoAlbum">
-		SELECT * FROM photo_album_ ORDER BY id_
+		SELECT * FROM photo_album_ where tenant_id_ = #{tenantId} ORDER BY id_
 	</select>
 	
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.PhotoAlbum" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		INSERT INTO photo_album_ (music_group_id_,name_,client_show_,type_,cover_url_,cover_thumbnail_url_,create_time_,update_time_,order_,time_line_)
+		INSERT INTO photo_album_ (music_group_id_,name_,client_show_,type_,cover_url_,cover_thumbnail_url_,create_time_,update_time_,order_,time_line_,tenant_id_)
 		VALUES(#{musicGroupId},#{name},#{clientShow,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-		       #{type},#{coverUrl},#{coverThumbnailUrl},NOW(),NOW(),#{order},#{timeLine})
+		       #{type},#{coverUrl},#{coverThumbnailUrl},NOW(),NOW(),#{order},#{timeLine},#{tenantId})
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -65,7 +66,7 @@
 			name_ = #{name},
 		</if>
 			update_time_ = NOW()
-		</set> WHERE id_ = #{id}
+		</set> WHERE id_ = #{id} and tenant_id_ = #{tenantId}
 	</update>
 	<update id="batchUpdate">
 		<foreach collection="photoAlbumList" item="album" separator=";">
@@ -95,7 +96,7 @@
 				name_ = #{album.name},
 			</if>
 			update_time_ = NOW()
-		</set> WHERE id_ = #{album.id}
+		</set> WHERE id_ = #{album.id} and tenant_id_ = #{album.tenantId}
 		</foreach>
 	</update>
 
@@ -116,6 +117,7 @@
 	</select>
 	<sql id="queryPageSql">
 		<where>
+			tenant_id_ = #{tenantId}
 			<if test="timeLine != null and timeLine != ''">
 				AND DATE_FORMAT(time_line_,"%Y%m") = #{timeLine}
 			</if>

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

@@ -16,6 +16,7 @@
 		<result column="order_" property="order" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
+        <result column="tenant_id_" property="tenantId"/>
 	</resultMap>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -25,20 +26,20 @@
 	
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="Photo">
-		SELECT * FROM photo_ ORDER BY id_
+		SELECT * FROM photo_ where tenant_id_ = #{tenantId} ORDER BY id_
 	</select>
 	
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.Photo" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		INSERT INTO photo_ (photo_album_id_,name_,client_show_,url_,thumbnail_url_,create_time_,update_time_,order_)
-		VALUES(#{photoAlbumId},#{name},#{clientShow,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{url},#{thumbnailUrl},NOW(),NOW(),#{order})
+		INSERT INTO photo_ (photo_album_id_,name_,client_show_,url_,thumbnail_url_,create_time_,update_time_,order_,tenant_id_)
+		VALUES(#{photoAlbumId},#{name},#{clientShow,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{url},#{thumbnailUrl},NOW(),NOW(),#{order},#{tenantId})
 	</insert>
 	<insert id="batchInsert">
-		INSERT INTO photo_ (photo_album_id_,name_,client_show_,url_,thumbnail_url_,create_time_,update_time_,order_)
+		INSERT INTO photo_ (photo_album_id_,name_,client_show_,url_,thumbnail_url_,create_time_,update_time_,order_,tenant_id_)
 		VALUES
 		<foreach collection="photoList" item="photo" separator=",">
 			(#{photo.photoAlbumId},#{photo.name},#{photo.clientShow,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-			 #{photo.url},#{photo.thumbnailUrl},NOW(),NOW(),#{photo.order})
+			 #{photo.url},#{photo.thumbnailUrl},NOW(),NOW(),#{photo.order},#{photo.tenantId})
 		</foreach>
 	</insert>
 
@@ -64,7 +65,7 @@
 		name_ = #{name},
 		</if>
 		update_time_ = NOW()
-		</set> WHERE id_ = #{id}
+		</set> WHERE id_ = #{id} and tenant_id_ = #{tenantId}
 	</update>
     <update id="batchUpdate">
 		<foreach collection="photoList" item="item" separator=";">
@@ -88,7 +89,7 @@
 				name_ = #{item.name},
 			</if>
 			update_time_ = NOW()
-		</set> WHERE id_ = #{item.id}
+		</set> WHERE id_ = #{item.id} and tenant_id_ = #{item.tenantId}
 		</foreach>
 	</update>
 
@@ -112,6 +113,7 @@
 	</select>
 	<sql id="queryPageSql">
 		<where>
+			tenant_id_ = #{tenantId}
 			<if test="photoAlbumId != null">
 				AND photo_album_id_ = #{photoAlbumId}
 			</if>

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

@@ -20,6 +20,7 @@
         <result column="courses_expire_date_" property="coursesExpireDate"/>
         <result column="create_time_" property="createTime"/>
         <result column="update_time_" property="updateTime"/>
+        <result column="tenant_id_" property="tenantId"/>
         <result column="memo_" property="memo"/>
         <result column="buy_months_" property="buyMonths"/>
         <result column="drill_times_on_week_" property="drillTimesOnWeek"/>
@@ -127,7 +128,7 @@
             </if>
             update_time_ = NOW()
         </set>
-        WHERE id_ = #{id}
+        WHERE id_ = #{id} and tenant_id_ = #{tenantId}
     </update>
 
     <update id="batchUpdate">
@@ -162,7 +163,7 @@
     <!-- 全查询 -->
     <select id="findAll" resultMap="PracticeGroup">
         SELECT *
-        FROM practice_group
+        FROM practice_group where tenant_id_ = #{tenantId}
     </select>
 
     <!-- 向数据库增加一条记录 -->
@@ -191,14 +192,14 @@
 
     <!-- 分页查询 -->
     <select id="queryPage" resultMap="PracticeGroup" parameterType="map">
-        SELECT * FROM practice_group
+        SELECT * FROM practice_group where tenant_id_ = #{tenantId}
         <include refid="global.limit"/>
     </select>
 
     <!-- 查询当前表的总记录数 -->
     <select id="queryCount" resultType="int">
         SELECT COUNT(*)
-        FROM practice_group
+        FROM practice_group where tenant_id_ = #{tenantId}
     </select>
     <select id="getUserPracticeCoursesWithDateRange" resultMap="PracticeGroup">
         SELECT *
@@ -227,9 +228,6 @@
         GROUP BY pg.id_ ORDER BY pg.id_ DESC
         <include refid="global.limit"/>
     </select>
-    <select id="countPracticeGroupOverCourse" resultType="java.util.Map">
-
-    </select>
 
     <select id="findUserLatestPracticeGroup" resultMap="PracticeGroup">
         SELECT *
@@ -293,6 +291,7 @@
 
     <sql id="practiceGroupQueryCondition">
         <where>
+        	pg.tenant_id_ = #{tenantId}
             <if test="hasEducationalTeacherId != null and hasEducationalTeacherId == true">
                 AND pg.educational_teacher_id_ IS NOT NULL
             </if>
@@ -371,9 +370,7 @@
     <sql id="practiceGroupReviewsQueryCondition">
         <where>
             pg.group_status_ != 'LOCK'
-            <if test="tenantId != null">
-                AND pg.tenanr_id_ = #{tenantId}
-            </if>
+            AND pg.tenanr_id_ = #{tenantId}
             <if test="month != null">
                 AND DATE_FORMAT(cse.create_time_, '%Y-%m') = #{month}
             </if>
@@ -534,6 +531,7 @@
     </select>
     <sql id="queryStudentBuysSql">
         <where>
+        	u.tenant_id_ = #{tenantId}
             <if test="search != null and search != ''">
                 (u.id_ = #{search} OR u.`username_` LIKE CONCAT('%',#{search},'%'))
             </if>
@@ -577,7 +575,7 @@
         LEFT JOIN organization o on o.id_ = pg.organ_id_
         LEFT JOIN sys_user su ON su.id_ = pg.student_id_
         left join sys_user edut ON edut.id_ = pg.educational_teacher_id_
-        WHERE pg.group_status_ IN ('NORMAL','FINISH')
+        WHERE pg.group_status_ IN ('NORMAL','FINISH') and pg.tenant_id_ = #{tenantId}
         <if test="organIds != null and organIds != ''">
             AND FIND_IN_SET(pg.organ_id_, #{organIds})
         </if>
@@ -590,7 +588,7 @@
         FROM
             sys_user su
         WHERE
-            1=1
+            su.tenant_id_ = #{tenantId}
             AND su.del_flag_=0 AND su.lock_flag_=0
 			AND FIND_IN_SET('STUDENT',su.user_type_)
             <if test="organIdList!=null">
@@ -611,7 +609,7 @@
         FROM
             sys_user su
         WHERE
-            1=1
+            su.tenant_id_ = #{tenantId}
             AND su.del_flag_=0 AND su.lock_flag_=0
 			AND FIND_IN_SET('STUDENT',su.user_type_)
             <if test="organIdList!=null">

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

@@ -24,6 +24,7 @@
 		<result column="single_class_minutes_price_" property="singleClassMinutesPrice" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
+        <result column="tenant_id_" property="tenantId"/>
 	</resultMap>
 
 	<!-- 根据主键查询一条记录 -->
@@ -34,7 +35,7 @@
 
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="PracticeGroupSellPrice">
-		SELECT * FROM practice_group_sell_price
+		SELECT * FROM practice_group_sell_price where tenant_id_ = #{tenantId}
 		ORDER BY id_
 	</select>
 
@@ -43,9 +44,9 @@
 		useGeneratedKeys="true" keyColumn="organ_id_" keyProperty="organId">
 		INSERT INTO practice_group_sell_price
 		(`organ_id_`, `once_original_price`, `once_activity_price`, `twice_original_price`,
-		 `twice_activity_price`, `create_time_`, `update_time_`,single_class_minutes_price_)
+		 `twice_activity_price`, `create_time_`, `update_time_`,single_class_minutes_price_,tenant_id_)
 		VALUES(#{organId},#{onceOriginalPrice},#{onceActivityPrice},#{twiceOriginalPrice},
-		       #{twiceActivityPrice},NOW(),NOW(),#{singleClassMinutesPrice})
+		       #{twiceActivityPrice},NOW(),NOW(),#{singleClassMinutesPrice},#{tenantId})
 	</insert>
 
 	<!-- 根据主键查询一条记录 -->
@@ -69,7 +70,7 @@
 			</if>
 			update_time_=NOW
 		</set>
-		WHERE organ_id_ = #{organId}
+		WHERE organ_id_ = #{organId} and tenant_id_ = #{tenantId}
 	</update>
 
 	<!-- 根据主键删除一条记录 -->
@@ -79,12 +80,12 @@
 
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="PracticeGroupSellPrice" parameterType="map">
-		SELECT * FROM practice_group_sell_price ORDER BY id_
+		SELECT * FROM practice_group_sell_price where tenant_id_ = #{tenantId} ORDER BY id_
 		<include refid="global.limit" />
 	</select>
 
 	<!-- 查询当前表的总记录数 -->
 	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM practice_group_sell_price
+		SELECT COUNT(*) FROM practice_group_sell_price where tenant_id_ = #{tenantId}
 	</select>
 </mapper>

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

@@ -11,12 +11,13 @@
 		<result column="user_id_" property="userId" />
 		<result column="create_time_" property="createTime" />
 		<result column="memo_" property="memo" />
+        <result column="tenant_id_" property="tenantId"/>
 	</resultMap>
 
 
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="PracticeLessonApply">
-		SELECT * FROM practice_lesson_apply
+		SELECT * FROM practice_lesson_apply where tenant_id_ = #{tenantId}
 	</select>
 	
 	<!-- 向数据库增加一条记录 -->
@@ -26,19 +27,19 @@
 		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
 		</selectKey>
 		-->
-		INSERT INTO practice_lesson_apply (id_,user_id_,create_time_,memo_) VALUES(#{id},#{userId},#{createTime},#{memo})
+		INSERT INTO practice_lesson_apply (id_,user_id_,create_time_,memo_,tenant_id_) VALUES(#{id},#{userId},#{createTime},#{memo},#{tenantId})
 	</insert>
 	
 	
 	
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="PracticeLessonApply" parameterType="map">
-		SELECT * FROM practice_lesson_apply <include refid="global.limit"/>
+		SELECT * FROM practice_lesson_apply where tenant_id_ = #{tenantId} <include refid="global.limit"/>
 	</select>
 	
 	<!-- 查询当前表的总记录数 -->
 	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM practice_lesson_apply
+		SELECT COUNT(*) FROM practice_lesson_apply where tenant_id_ = #{tenantId} 
 	</select>
     <select id="findByUserId" resultMap="PracticeLessonApply">
 		SELECT * FROM practice_lesson_apply WHERE user_id_ = #{userId} LIMIT 1 FOR UPDATE

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

@@ -15,6 +15,7 @@
 		<result column="is_over_" property="isOver"/>
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
+        <result column="tenant_id_" property="tenantId"/>
 	</resultMap>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -26,6 +27,7 @@
 	<select id="findAll" resultMap="QuestionnaireQuestionItem">
 		SELECT * FROM questionnaire_question_item 
 		<where>
+			tenant_id_ = #{tenantId}
 			<if test="questionIdList != null and questionIdList.size > 0">
 				AND questionnaire_question_id_ IN
 				<foreach collection="questionIdList" open="(" close=")" separator="," item="item">
@@ -38,15 +40,15 @@
 	
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.QuestionnaireQuestionItem" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		INSERT INTO questionnaire_question_item (questionnaire_topic_id_,questionnaire_question_id_,answer_value_,sort_,is_over_,create_time_,update_time_)
-		VALUES(#{questionnaireTopicId},#{questionnaireQuestionId},#{answerValue},#{sort},#{isOver},NOW(),NOW())
+		INSERT INTO questionnaire_question_item (questionnaire_topic_id_,questionnaire_question_id_,answer_value_,sort_,is_over_,create_time_,update_time_,tenant_id_)
+		VALUES(#{questionnaireTopicId},#{questionnaireQuestionId},#{answerValue},#{sort},#{isOver},NOW(),NOW(),#{tenantId})
 	</insert>
 
     <insert id="batchInsert" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		INSERT INTO questionnaire_question_item (questionnaire_topic_id_,questionnaire_question_id_,answer_value_,sort_,is_over_,create_time_,update_time_)
+		INSERT INTO questionnaire_question_item (questionnaire_topic_id_,questionnaire_question_id_,answer_value_,sort_,is_over_,create_time_,update_time_,tenant_id_)
 		VALUES
 		<foreach collection="questionItemList" item="item" separator=",">
-			(#{topicId},#{questionId},#{item.answerValue},#{item.sort},#{item.isOver},NOW(),NOW())
+			(#{topicId},#{questionId},#{item.answerValue},#{item.sort},#{item.isOver},NOW(),NOW(),#{tenantId})
 		</foreach>
 	</insert>
 
@@ -65,7 +67,7 @@
 		<if test="answerValue != null">
 			answer_value_ = #{answerValue},
 		</if>
-		</set> WHERE id_ = #{id}
+		</set> WHERE id_ = #{id} and tenant_id_ = #{tenantId}
 	</update>
 	
 	<!-- 根据主键删除一条记录 -->
@@ -105,12 +107,12 @@
 
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="QuestionnaireQuestionItem" parameterType="map">
-		SELECT * FROM questionnaire_question_item ORDER BY id_ <include refid="global.limit"/>
+		SELECT * FROM questionnaire_question_item where tenant_id_ = #{tenantId} ORDER BY id_ <include refid="global.limit"/>
 	</select>
 	
 	<!-- 查询当前表的总记录数 -->
 	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM questionnaire_question_item
+		SELECT COUNT(*) FROM questionnaire_question_item where tenant_id_ = #{tenantId}
 	</select>
     <select id="findByQuestionId" resultMap="QuestionnaireQuestionItem">
 		SELECT * FROM questionnaire_question_item WHERE questionnaire_question_id_ = #{questionId} LIMIT 1

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

@@ -16,6 +16,7 @@
 		<result column="desc_" property="desc" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
+        <result column="tenant_id_" property="tenantId"/>
 		<collection property="questionnaireQuestionItemList" ofType="com.ym.mec.biz.dal.entity.QuestionnaireQuestionItem">
 			<result column="item_id_" property="id" />
 			<result column="item_questionnaire_topic_id_" property="questionnaireTopicId" />
@@ -41,6 +42,7 @@
 		FROM questionnaire_question qq
 		LEFT JOIN questionnaire_question_item qqi ON qq.id_ = qqi.questionnaire_question_id_
 		<where>
+			qq.tenant_id_ = #{tenantId}
 			<if test="topicId != null">
 				AND qq.questionnaire_topic_id_ = #{topicId}
 			</if>
@@ -50,8 +52,8 @@
 	
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.QuestionnaireQuestion" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		INSERT INTO questionnaire_question (questionnaire_topic_id_,content_,type_,sort_,is_require_,desc_,create_time_,update_time_)
-		VALUES(#{questionnaireTopicId},#{content},#{type},#{sort},#{isRequire},#{desc},NOW(),NOW())
+		INSERT INTO questionnaire_question (questionnaire_topic_id_,content_,type_,sort_,is_require_,desc_,create_time_,update_time_,tenant_id_)
+		VALUES(#{questionnaireTopicId},#{content},#{type},#{sort},#{isRequire},#{desc},NOW(),NOW(),#{tenantId})
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -75,7 +77,7 @@
 		<if test="desc != null">
 			desc_ = #{desc},
 		</if>
-		</set> WHERE id_ = #{id}
+		</set> WHERE id_ = #{id} and tenant_id_ = #{tenantId}
 	</update>
 	
 	<!-- 根据主键删除一条记录 -->
@@ -92,6 +94,7 @@
 
 	<sql id="queryPageSql">
 		<where>
+			tenant_id_ = #{tenantId}
 			<if test="topicId != null">
 				AND questionnaire_topic_id_ = #{topicId}
 			</if>
@@ -124,7 +127,7 @@
 			qq.*
 		FROM
 			questionnaire_question qq
-		WHERE
+		WHERE qq.tennat_id_ = #{tenantId} and 
 				qq.questionnaire_topic_id_ = ( SELECT questionnaire_topic_id_ FROM questionnaire_user_result WHERE active_type_ = 'CLOUD_TEACHER_FEEDBACK' LIMIT 1 )
 		ORDER BY
 			sort_

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

@@ -15,6 +15,7 @@
 		<result column="tenant_id_" property="tenantId" />
 		<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="QuestionnaireTopic">
-		SELECT * FROM questionnaire_topic ORDER BY id_
+		SELECT * FROM questionnaire_topic where tenant_id_ = #{tenantId} ORDER BY id_
 	</select>
 	
 	<!-- 向数据库增加一条记录 -->
@@ -61,15 +62,13 @@
 
 	<sql id="queryPageSql">
 		<where>
+			 tenant_id_ = #{tenantId}
 			<if test="search != null and search != ''">
 				AND (id_ = #{search} OR title_ LIKE CONCAT('%',#{search},'%'))
 			</if>
 			<if test="status != null">
 				AND status_ = #{status}
 			</if>
-			<if test="tenantId != null">
-				AND tenant_id_ = #{tenantId}
-			</if>
 		</where>
 	</sql>
 	<!-- 分页查询 -->

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

@@ -19,6 +19,7 @@
 		<result column="additional_value_" property="additionalValue" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
+        <result column="tenant_id_" property="tenantId"/>
 	</resultMap>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -31,6 +32,7 @@
 		SELECT qur.* FROM questionnaire_user_result qur
 		LEFT JOIN sys_user su ON su.id_ = qur.user_id_
 		<where>
+			tenant_id_ = #{tenantId}
 			<if test="userId != null">
 				AND qur.user_id_ = #{userId}
 			</if>
@@ -47,18 +49,18 @@
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.QuestionnaireUserResult" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
 		INSERT INTO questionnaire_user_result (user_id_,questionnaire_topic_id_,questionnaire_question_id_,
-		                                       questionnaire_question_item_id_list_,additional_value_,active_type_,active_id_,create_time_,update_time_)
+		                                       questionnaire_question_item_id_list_,additional_value_,active_type_,active_id_,create_time_,update_time_,tenant_id_)
 		VALUES(#{userId},#{questionnaireTopicId},#{questionnaireQuestionId},#{questionnaireQuestionItemIdList},#{additionalValue}
-			  ,#{activeType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{activeId},NOW(),NOW())
+			  ,#{activeType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{activeId},NOW(),NOW(),#{tenantId})
 	</insert>
 
 	<insert id="batchInsert1">
 		INSERT INTO questionnaire_user_result (user_id_,questionnaire_topic_id_,questionnaire_question_id_,
-		questionnaire_question_item_id_list_,additional_value_,active_type_,active_id_,create_time_,update_time_)
+		questionnaire_question_item_id_list_,additional_value_,active_type_,active_id_,create_time_,update_time_,tenant_id_)
 		VALUES
 		<foreach collection="questionnaireUserResultList" item="item" separator=",">
 			(#{item.userId},#{item.questionnaireTopicId},#{item.questionnaireQuestionId},#{item.questionnaireQuestionItemIdList},#{item.additionalValue}
-			,#{item.activeType},#{item.activeId},NOW(),NOW())
+			,#{item.activeType},#{item.activeId},NOW(),NOW(),#{tenantId})
 		</foreach>
 	</insert>
 
@@ -87,7 +89,7 @@
 			additional_value_ = #{additionalValue},
 		</if>
 			update_time_ = NOW()
-	</set> WHERE id_ = #{id}
+	</set> WHERE id_ = #{id} and tenant_id_ = #{tenantId}
 	</update>
 	
 	<!-- 根据主键删除一条记录 -->
@@ -128,12 +130,12 @@
 
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="QuestionnaireUserResult" parameterType="map">
-		SELECT * FROM questionnaire_user_result ORDER BY id_ <include refid="global.limit"/>
+		SELECT * FROM questionnaire_user_result where tenant_id_ = #{tenantId} ORDER BY id_ <include refid="global.limit"/>
 	</select>
 
 	<!-- 查询当前表的总记录数 -->
 	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM questionnaire_user_result
+		SELECT COUNT(*) FROM questionnaire_user_result where tenant_id_ = #{tenantId}
 	</select>
 
     <select id="countByTopicId" resultType="java.lang.Integer">
@@ -164,6 +166,7 @@
 	</resultMap>
 	<sql id="queryDetailPageSql">
 		<where>
+			 qu.tenant_id_ = #{tenantId}
 			<if test="search != null and search != ''">
 				qu.user_id_ = #{search} OR ria.username_ LIKE CONCAT('%',#{search},'%') OR ria.mobile_no_ LIKE CONCAT('%',#{search},'%')
 			</if>
@@ -181,6 +184,7 @@
 
 	<sql id="queryDetailPageSql1">
 		<where>
+			 qu1.tenant_id_ = #{tenantId}
 			<if test="activeId != null">
 				AND qu1.active_id_ = #{activeId}
 			</if>

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

@@ -26,6 +26,7 @@
         <result column="pay_status_" property="payStatus"/>
         <result column="create_time_" property="createTime"/>
         <result column="update_time_" property="updateTime"/>
+        <result column="tenant_id_" property="tenantId"/>
     </resultMap>
 
     <resultMap id="ReplacementInstrumentActivityStatDto"
@@ -53,7 +54,7 @@
     <!-- 全查询 -->
     <select id="findAll" resultMap="ReplacementInstrumentActivity">
         SELECT *
-        FROM replacement_instrument_activity
+        FROM replacement_instrument_activity where tenant_id_ = #{tenantId}
         ORDER BY id_
     </select>
 
@@ -62,9 +63,9 @@
             keyColumn="id" keyProperty="id">
         INSERT INTO replacement_instrument_activity (cooperation_organ_id_, user_id_, user_name_, grade_, classes_,
                                                      mobile_no_, subject_id_, question_result_, instruments_id_,
-                                                     goods_id_,other_suggestion_,topic_id_,replacement_instrument_cooperation_id_,create_time_, update_time_)
+                                                     goods_id_,other_suggestion_,topic_id_,replacement_instrument_cooperation_id_,create_time_, update_time_,tenant_id_)
         VALUES (#{cooperationOrganId}, #{userId}, #{userName}, #{grade}, #{classes}, #{mobileNo}, #{subjectId},
-                #{questionResult}, #{instrumentsId}, #{goodsId}, #{otherSuggestion}, #{topicId},#{replacementInstrumentCooperationId}, NOW(), NOW())
+                #{questionResult}, #{instrumentsId}, #{goodsId}, #{otherSuggestion}, #{topicId},#{replacementInstrumentCooperationId}, NOW(), NOW(),#{tenantId})
     </insert>
 
     <!-- 根据主键查询一条记录 -->
@@ -114,7 +115,7 @@
                 grade_ = #{grade},
             </if>
         </set>
-        WHERE id_ = #{id}
+        WHERE id_ = #{id} and tenant_id_ = #{tenantId}
     </update>
 
     <!-- 根据主键删除一条记录 -->
@@ -126,14 +127,14 @@
 
     <!-- 分页查询 -->
     <select id="queryPage" resultMap="ReplacementInstrumentActivityStatDto" parameterType="map">
-        SELECT * FROM replacement_instrument_activity
+        SELECT * FROM replacement_instrument_activity where tenant_id_ = #{tenantId}
         <include refid="global.limit"/>
     </select>
 
     <!-- 查询当前表的总记录数 -->
     <select id="queryCount" resultType="int">
         SELECT COUNT(*)
-        FROM replacement_instrument_activity
+        FROM replacement_instrument_activity where tenant_id_ = #{tenantId}
     </select>
     <select id="findByUserId" resultMap="ReplacementInstrumentActivity">
         SELECT *
@@ -148,6 +149,7 @@
 
     <sql id="queryReplacementsCondition">
         <where>
+        	ria.tenant_id_ = #{tenantId}
             <if test="cooperationOrganId!=null">
                 AND ria.cooperation_organ_id_ = #{cooperationOrganId}
             </if>

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

@@ -14,6 +14,7 @@
         <result column="title_" property="title"/>
         <result column="create_time_" property="createTime"/>
         <result column="update_time_" property="updateTime"/>
+        <result column="tenant_id_" property="tenantId"/>
     </resultMap>
 
     <!-- 根据主键查询一条记录 -->
@@ -26,11 +27,11 @@
             useGeneratedKeys="true" keyColumn="id" keyProperty="id">
         <!--@mbg.generated-->
         insert into replacement_instrument_cooperation (organ_id_, cooperation_organ_id_, open_pay_,show_question_,topic_id_, create_time_,
-        update_time_,title_
+        update_time_,title_,tenant_id_
         )
         values (#{organId}, #{cooperationOrganId},
         #{openPay,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{showQuestion,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-        #{topicId}, NOW(), NOW(),#{title}
+        #{topicId}, NOW(), NOW(),#{title},#{tenantId}
         )
     </insert>
 
@@ -61,7 +62,7 @@
                 update_time_ = NOW(),
             </if>
         </set>
-        WHERE id_ = #{id}
+        WHERE id_ = #{id} and tenant_id_ = #{tenantId}
     </update>
 
     <!-- 分页查询 -->
@@ -76,6 +77,7 @@
     </select>
     <sql id="queryPageSql">
         <where>
+        	ric.tenant_id_ = #{tenantId}
             <if test="organId != null">
                 AND FIND_IN_SET(ric.organ_id_ , #{organId})
             </if>
@@ -103,7 +105,7 @@
                COUNT(user_id_)                           activeNum,
                SUM(IF(instruments_id_ IS NOT NULL AND instruments_id_ > 0, 1, 0)) replaceNum,
                SUM(IF(pay_status_ = 2, 1, 0)) payNum,replacement_instrument_cooperation_id_ id
-        FROM replacement_instrument_activity
+        FROM replacement_instrument_activity where tenant_id_ = #{tenantId}
         GROUP BY replacement_instrument_cooperation_id_
     </select>
     <select id="findByCooperationOrganIdAndTopicId" resultMap="ReplacementInstrumentCooperation">

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

@@ -18,6 +18,7 @@
 		<result column="sale_price_" property="salePrice" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
+        <result column="tenant_id_" property="tenantId"/>
 	</resultMap>
 
 	<!-- 根据主键查询一条记录 -->
@@ -28,13 +29,13 @@
 	
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="ReplacementInstrument">
-		SELECT * FROM replacement_instrument
+		SELECT * FROM replacement_instrument where tenant_id_ = #{tenantId}
 	</select>
 	
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.ReplacementInstrument" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		INSERT INTO replacement_instrument (subject_id_,brand_,specification_,param_,market_price_,discount_price_,depreciation_price_,sale_price_,create_time_,update_time_)
-		VALUES(#{subjectId},#{brand},#{specification},#{param},#{marketPrice},#{discountPrice},#{depreciationPrice},#{salePrice},NOW(),NOW())
+		INSERT INTO replacement_instrument (subject_id_,brand_,specification_,param_,market_price_,discount_price_,depreciation_price_,sale_price_,create_time_,update_time_,tenant_id_)
+		VALUES(#{subjectId},#{brand},#{specification},#{param},#{marketPrice},#{discountPrice},#{depreciationPrice},#{salePrice},NOW(),NOW(),#{tenantId})
 	</insert>
 
 	<update id="update" parameterType="com.ym.mec.biz.dal.entity.ReplacementInstrument">
@@ -66,7 +67,7 @@
 		<if test="updateTime != null">
 			update_time_ = #{updateTime},
 		</if>
-	</set> WHERE id_ = #{id}
+	</set> WHERE id_ = #{id} and tenant_id_ = #{tenantId}
 	</update>
 
 	<!-- 根据主键删除一条记录 -->
@@ -83,6 +84,7 @@
 	</select>
 	<sql id="queryPageSql">
 		<where>
+			tenant_id_ = #{tenantId}
 			<if test="subjectId != null">
 				AND subject_id_ = #{subjectId}
 			</if>

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

@@ -17,18 +17,19 @@
 		<result column="del_flag_" property="delFlag" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
+        <result column="tenant_id_" property="tenantId"/>
 	</resultMap>
 	
 	
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="ResourceRespository">
-		SELECT * FROM resource_respository
+		SELECT * FROM resource_respository where tenant_id_ = #{tenantId}
 	</select>
 	
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.ResourceRespository" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		INSERT INTO resource_respository (id_,name_,url_,order_,subject_id_,level_,parent_id_,del_flag_,create_time_,update_time_)
-		VALUES(#{id},#{name},#{url},#{order},#{subjectId},#{level},#{parentId},#{delFlag},now(),now())
+		INSERT INTO resource_respository (id_,name_,url_,order_,subject_id_,level_,parent_id_,del_flag_,create_time_,update_time_,tenant_id_)
+		VALUES(#{id},#{name},#{url},#{order},#{subjectId},#{level},#{parentId},#{delFlag},now(),now(),#{tenantId})
 	</insert>
 	
 	
@@ -37,7 +38,7 @@
 	<select id="queryPage" resultMap="ResourceRespository" parameterType="map">
 		SELECT * FROM resource_respository
 		<where>
-			del_flag_ != 1
+			del_flag_ != 1 and tenant_id_ = #{tenantId}
 			<if test="search != null">
 				AND name_ LIKE CONCAT('%',#{search},'%')
 			</if>
@@ -49,7 +50,7 @@
 	<select id="queryCount" resultType="int">
 		SELECT COUNT(id_) FROM resource_respository
 		<where>
-			del_flag_ != 1
+			del_flag_ != 1 and tenant_id_ = #{tenantId}
 			<if test="search != null">
 				AND name_ LIKE CONCAT('%',#{search},'%')
 			</if>
@@ -58,6 +59,7 @@
     <select id="findList" resultMap="ResourceRespository">
 		SELECT * FROM resource_respository
 		<where>
+			tenant_id_ = #{tenantId}
 			<if test="delFlag != null">
 				AND del_flag_ = #{delFlag}
 			</if>

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

@@ -22,6 +22,7 @@
         <result column="subsidy_" property="subsidy"/>
         <result column="cooperation_organ_id_" property="cooperationOrganId"/>
         <result column="remark_" property="remark"/>
+        <result column="tenant_id_" property="tenantId"/>
     </resultMap>
 
     <!-- 根据主键查询一条记录 -->
@@ -31,15 +32,15 @@
 
     <!-- 全查询 -->
     <select id="findAll" resultMap="School">
-		SELECT * FROM school ORDER BY id_
+		SELECT * FROM school where tenant_id_ = #{tenantId} ORDER BY id_
 	</select>
 
     <!-- 向数据库增加一条记录 -->
     <insert id="insert" parameterType="com.ym.mec.biz.dal.entity.School" useGeneratedKeys="true" keyColumn="id"
             keyProperty="id">
         INSERT INTO school
-        (id_,user_id_,name_,organ_id_,address_,contact_phone_,create_time_,update_time_,contact_name_,longitude_latitude_,subsidy_,cooperation_organ_id_,remark_)
-        VALUES(#{id},#{userId},#{name},#{organId},#{address},#{contactPhone},now(),now(),#{contactName},#{longitudeLatitude},#{subsidy},#{cooperationOrganId},#{remark})
+        (id_,user_id_,name_,organ_id_,address_,contact_phone_,create_time_,update_time_,contact_name_,longitude_latitude_,subsidy_,cooperation_organ_id_,remark_,tenant_id_)
+        VALUES(#{id},#{userId},#{name},#{organId},#{address},#{contactPhone},now(),now(),#{contactName},#{longitudeLatitude},#{subsidy},#{cooperationOrganId},#{remark},#{tenantId})
     </insert>
 
     <!-- 根据主键查询一条记录 -->
@@ -83,7 +84,7 @@
                 remark_ = #{remark},
             </if>
         </set>
-        WHERE id_ = #{id}
+        WHERE id_ = #{id} and tenant_id_ = #{tenantId}
     </update>
 
     <!-- 根据主键删除一条记录 -->
@@ -101,6 +102,7 @@
         <include refid="global.limit"/>
     </select>
     <sql id="queryPageSql">
+    	s.tenant_id_ = #{tenantId}
         <if test="cooperationOrganId != null">
             AND s.cooperation_organ_id_ = #{cooperationOrganId}
         </if>
@@ -130,9 +132,7 @@
         SELECT * FROM school
         <where>
             del_flag_ = 0 and user_id_ is null
-            <if test="organId != null">
                 AND FIND_IN_SET(organ_id_,#{organId})
-            </if>
         </where>
     </select>
     <select id="queryNameByIds" resultType="java.util.Map" >
@@ -144,9 +144,7 @@
     </select>
     <select id="findVipSchoolByUserId" resultMap="School">
         SELECT * FROM school WHERE del_flag_ = 0
-        <if test="organId != null">
         AND ((FIND_IN_SET(organ_id_,#{organId}) and user_id_ is NULL) or user_id_ = #{userId})
-        </if>
         <if test="search != null and search != ''">
             AND (name_ LIKE CONCAT('%',#{search},'%') OR address_ LIKE CONCAT('%',#{search},'%'))
         </if>

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

@@ -5,6 +5,7 @@
         <!--@mbg.generated-->
         <!--@Table sell_order-->
         <id column="id_" property="id"/>
+        <result column="tenant_id_" property="tenantId"/>
         <result column="organ_id_" property="organId"/>
         <result column="edu_teacher_id_" property="eduTeacherId"/>
         <result column="eduTeacher" property="eduTeacher"/>
@@ -44,7 +45,7 @@
     </resultMap>
     <sql id="Base_Column_List">
         <!--@mbg.generated-->
-        id_, edu_teacher_id_,organ_id_, cooperation_organ_id_, trans_no_,order_id_, order_no_, expect_amount_,
+        id_, tenant_id_, edu_teacher_id_,organ_id_, cooperation_organ_id_, trans_no_,order_id_, order_no_, expect_amount_,
         actual_amount_,balance_amount_, sell_cost_, sell_cost2_, type_,parent_goods_id_, goods_id_,goods_name_, num_,
         user_id_,
         payment_channel_,mer_no_,batch_no_,stock_type_,account_type_,status_, refund_time_,sell_time_, create_ime_,
@@ -68,13 +69,13 @@
         insert into sell_order (edu_teacher_id_,organ_id_, cooperation_organ_id_, trans_no_,order_id_, order_no_,
         expect_amount_,actual_amount_,balance_amount_, type_,parent_goods_id_, goods_id_,goods_name_, sell_cost_,
         sell_cost2_, num_, user_id_, payment_channel_,
-        mer_no_,batch_no_,stock_type_,account_type_, refund_time_,sell_time_, create_ime_, update_time_,coupon_remit_amount_)
+        mer_no_,batch_no_,stock_type_,account_type_, refund_time_,sell_time_, create_ime_, update_time_,coupon_remit_amount_,tenant_id_)
         values (#{eduTeacherId},#{organId}, #{cooperationOrganId}, #{transNo}, #{orderNo},#{orderId}, #{expectAmount},
         #{actualAmount}, #{balanceAmount}, #{type},#{parentGoodsId}, #{goodsId}, #{goodsName}, #{sellCost},
         #{sellCost2}, #{num}, #{userId},
         #{paymentChannel}, #{merNo},#{batchNo},
         #{stockType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{accountType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-        #{refundTime},#{sellTime}, #{createIme}, #{updateTime}, #{couponRemitAmount})
+        #{refundTime},#{sellTime}, #{createIme}, #{updateTime}, #{couponRemitAmount},#{tenantId})
     </insert>
     <update id="update" parameterType="com.ym.mec.biz.dal.entity.SellOrder">
         <!--@mbg.generated-->
@@ -165,7 +166,7 @@
                 update_time_ = #{updateTime},
             </if>
         </set>
-        where id_ = #{id}
+        where id_ = #{id} and tenant_id_ = #{tenantId}
     </update>
 
     <update id="batchUpdate" parameterType="com.ym.mec.biz.dal.entity.SellOrder">
@@ -252,7 +253,7 @@
                 </if>
                 update_time_ = NOW()
             </set>
-            where id_ = #{sellOrder.id}
+            where id_ = #{sellOrder.id} and tenant_id_ = #{sellOrder.tenantId}
         </foreach>
     </update>
 
@@ -260,7 +261,7 @@
         insert into sell_order (organ_id_, cooperation_organ_id_, trans_no_,order_id_, order_no_, expect_amount_,
         actual_amount_,balance_amount_, type_, parent_goods_id_, goods_id_,goods_name_, sell_cost_, sell_cost2_, num_,
         user_id_, payment_channel_,
-        mer_no_,batch_no_,stock_type_,account_type_, sell_time_,edu_teacher_id_, create_ime_, update_time_,coupon_remit_amount_)
+        mer_no_,batch_no_,stock_type_,account_type_, sell_time_,edu_teacher_id_, create_ime_, update_time_,coupon_remit_amount_,tenant_id_)
         VALUE
         <foreach collection="sellOrders" separator="," item="sellOrder">
             (#{sellOrder.organId},#{sellOrder.cooperationOrganId},#{sellOrder.transNo},#{sellOrder.orderId},#{sellOrder.orderNo},
@@ -268,7 +269,7 @@
             #{sellOrder.goodsName},#{sellOrder.sellCost},#{sellOrder.sellCost2},#{sellOrder.num},#{sellOrder.userId},
             #{sellOrder.paymentChannel},#{sellOrder.merNo},#{sellOrder.batchNo},
             #{sellOrder.stockType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{sellOrder.accountType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-            #{sellOrder.sellTime},#{sellOrder.eduTeacherId},NOW(),NOW(),#{sellOrder.couponRemitAmount})
+            #{sellOrder.sellTime},#{sellOrder.eduTeacherId},NOW(),NOW(),#{sellOrder.couponRemitAmount},#{sellOrder.tenantId})
         </foreach>
     </insert>
 
@@ -298,6 +299,7 @@
 
     <sql id="queryPageSql">
         <where>
+        	so.tenant_id_  = #{tenantId}
             <if test="search != null and search != ''">
                 AND (so.order_no_ = #{search} OR so.trans_no_ = #{search})
             </if>
@@ -342,7 +344,7 @@
                  LEFT JOIN music_group mg ON mg.id_ = spo.music_group_id_
                  LEFT JOIN cooperation_organ co ON co.id_ = mg.cooperation_organ_id_
         WHERE spo.status_ = 'SUCCESS'
-          AND spo.group_type_ = 'MUSIC'
+          AND spo.group_type_ = 'MUSIC' and spo.tenant_id_ = #{tenantId}
           AND spo.create_time_ >= #{startTime}
           AND spo.create_time_ <= #{endTime}
         GROUP BY spo.organ_id_, co.id_
@@ -356,7 +358,7 @@
                  LEFT JOIN music_group mg ON mg.id_ = spo.music_group_id_
                  LEFT JOIN cooperation_organ co ON co.id_ = mg.cooperation_organ_id_
         WHERE spo.status_ = 'SUCCESS'
-          AND spo.group_type_ = 'MUSIC'
+          AND spo.group_type_ = 'MUSIC' and spo.tenant_id_ = #{tenantId}
           AND spo.create_time_ >= #{startTime}
           AND spo.create_time_ <= #{endTime}
         GROUP BY spo.organ_id_, co.id_
@@ -377,7 +379,7 @@
                  LEFT JOIN music_group mg ON mg.id_ = sr.music_group_id_
                  LEFT JOIN cooperation_organ co ON co.id_ = mg.cooperation_organ_id_
         WHERE spo.status_ = 'SUCCESS'
-          AND spo.group_type_ IN ('VIP', 'PRACTICE')
+          AND spo.group_type_ IN ('VIP', 'PRACTICE') and spo.tenant_id_ = #{tenantId}
           AND spo.create_time_ >= #{startTime}
           AND spo.create_time_ <= #{endTime}
         GROUP BY spo.organ_id_, co.id_
@@ -394,7 +396,7 @@
                  LEFT JOIN sell_order so on so.order_id_ = spo.id_
                  LEFT JOIN cooperation_organ co ON co.id_ = spo.music_group_id_
         WHERE spo.status_ = 'SUCCESS'
-          AND spo.group_type_ = 'OUTORDER'
+          AND spo.group_type_ = 'OUTORDER' and spo.tenant_id_ = #{tenantId}
           AND spo.create_time_ >= #{startTime}
           AND spo.create_time_ <= #{endTime}
         GROUP BY spo.organ_id_, co.id_
@@ -408,7 +410,7 @@
         FROM student_payment_order spo
                  LEFT JOIN cooperation_organ co ON co.id_ = spo.music_group_id_
         WHERE spo.status_ = 'SUCCESS'
-          AND spo.group_type_ = 'OUTORDER'
+          AND spo.group_type_ = 'OUTORDER' and spo.tenant_id_ = #{tenantId}
           AND spo.create_time_ >= #{startTime}
           AND spo.create_time_ <= #{endTime}
         GROUP BY spo.organ_id_, co.id_
@@ -425,7 +427,7 @@
                  LEFT JOIN music_group mg ON mg.id_ = sci.music_group_id_
                  LEFT JOIN cooperation_organ co ON co.id_ = mg.cooperation_organ_id_
         WHERE spo.status_ = 'SUCCESS'
-          AND spo.group_type_ = 'SPORADIC'
+          AND spo.group_type_ = 'SPORADIC' and spo.tenant_id_ = #{tenantId}
           AND sci.charge_type_ = '9'
           AND spo.create_time_ >= #{startTime}
           AND spo.create_time_ <= #{endTime}
@@ -443,7 +445,7 @@
                  LEFT JOIN cooperation_organ co ON co.id_ = mg.cooperation_organ_id_
         WHERE spo.status_ = 'SUCCESS'
           AND spo.group_type_ = 'SPORADIC'
-          AND sci.charge_type_ != '9'
+          AND sci.charge_type_ != '9' and spo.tenant_id_ = #{tenantId}
           AND spo.create_time_ >= #{startTime}
           AND spo.create_time_ <= #{endTime}
         GROUP BY spo.organ_id_, co.id_
@@ -458,7 +460,7 @@
         FROM student_payment_order spo
                  LEFT JOIN sell_order so on so.order_id_ = spo.id_
         WHERE spo.status_ = 'SUCCESS'
-          AND spo.group_type_ = 'REPAIR'
+          AND spo.group_type_ = 'REPAIR' and spo.tenant_id_ = #{tenantId}
           AND spo.create_time_ >= #{startTime}
           AND spo.create_time_ <= #{endTime}
         GROUP BY spo.organ_id_
@@ -472,7 +474,7 @@
         FROM student_payment_order spo
                  LEFT JOIN sell_order so on so.order_id_ = spo.id_
         WHERE spo.status_ = 'SUCCESS'
-          AND spo.group_type_ = 'REPAIR'
+          AND spo.group_type_ = 'REPAIR' and spo.tenant_id_ = #{tenantId}
           AND spo.create_time_ >= #{startTime}
           AND spo.create_time_ <= #{endTime}
         GROUP BY spo.organ_id_
@@ -489,7 +491,7 @@
         FROM student_payment_order spo
                  LEFT JOIN sell_order so on so.order_id_ = spo.id_
         WHERE spo.status_ = 'SUCCESS'
-          AND spo.group_type_ = 'GOODS_SELL'
+          AND spo.group_type_ = 'GOODS_SELL' and spo.tenant_id_ = #{tenantId}
           AND spo.create_time_ >= #{startTime}
           AND spo.create_time_ <= #{endTime}
         GROUP BY spo.organ_id_, so.cooperation_organ_id_
@@ -528,7 +530,7 @@
         FROM student_payment_order spo
                  LEFT JOIN sell_order so on so.order_id_ = spo.id_
         WHERE spo.status_ = 'SUCCESS'
-          AND spo.group_type_ = 'SUBJECT_CHANGE'
+          AND spo.group_type_ = 'SUBJECT_CHANGE' and spo.tenant_id_ = #{tenantId}
           AND spo.create_time_ >= #{startTime}
           AND spo.create_time_ <= #{endTime}
         GROUP BY spo.organ_id_, spo.music_group_id_
@@ -542,7 +544,7 @@
                SUM(spo.actual_amount_) income_total_
         FROM student_payment_order spo
         WHERE spo.status_ = 'SUCCESS'
-          AND spo.group_type_ = 'SUBJECT_CHANGE'
+          AND spo.group_type_ = 'SUBJECT_CHANGE' and spo.tenant_id_ = #{tenantId}
           AND spo.create_time_ >= #{startTime}
           AND spo.create_time_ <= #{endTime}
         GROUP BY spo.organ_id_, spo.music_group_id_
@@ -554,7 +556,7 @@
                cooperation_organ_id_,
                -SUM(sell_cost_ * num_) sell_cost_
         FROM sell_order
-        WHERE status_ = 1
+        WHERE status_ = 1 and spo.tenant_id_ = #{tenantId}
           AND refund_time_ >= #{startTime}
           AND refund_time_ <= #{endTime}
         GROUP BY organ_id_, cooperation_organ_id_
@@ -577,7 +579,7 @@
     <select id="getNoneBatchNoSellOrderIds" resultType="int">
         SELECT id_
         FROM sell_order
-        WHERE status_ = 0
+        WHERE status_ = 0 and tenant_id_ = #{tenantId}
           AND stock_type_ IS NOT NULL
           AND batch_no_ IS NULL
         ORDER BY sell_time_

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

@@ -24,6 +24,7 @@
         <result column="paid_amount_" property="paidAmount"/>
         <result column="open_max_term_" property="openMaxTerm" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="version_" property="version"/>
+        <result column="tenant_id_" property="tenantId"/>
     </resultMap>
 
     <!-- 根据主键查询一条记录 -->
@@ -36,7 +37,7 @@
     <!-- 全查询 -->
     <select id="findAll" resultMap="SporadicChargeInfo">
         SELECT *
-        FROM sporadic_charge_info
+        FROM sporadic_charge_info where tenant_id_ = #{tenantId}
         ORDER BY id_
     </select>
 
@@ -45,10 +46,10 @@
             useGeneratedKeys="true" keyColumn="id" keyProperty="id">
         INSERT INTO sporadic_charge_info
         (title_, charge_type_, organ_id_, amount_, discount_amount_, detail_, create_time_, update_time_, operator_id_,
-         user_id_, music_group_id_, max_num_,max_amount_,open_max_term_)
+         user_id_, music_group_id_, max_num_,max_amount_,open_max_term_,tenant_id_)
         VALUES (#{title}, #{chargeType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
                 #{organId}, #{amount}, #{discountAmount}, #{detail}, now(), now(), #{operatorId}, #{userId},
-                #{musicGroupId}, #{maxNum},#{maxAmount},#{openMaxTerm,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler})
+                #{musicGroupId}, #{maxNum},#{maxAmount},#{openMaxTerm,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{tenantId})
     </insert>
 
     <!-- 根据主键查询一条记录 -->
@@ -107,7 +108,7 @@
                 version_ = version_+1,
             </if>
         </set>
-        WHERE id_ = #{id} AND version_ = #{version}
+        WHERE id_ = #{id} AND version_ = #{version} and tenant_id_ = #{tenantId}
     </update>
 
     <!-- 根据主键删除一条记录 -->
@@ -128,7 +129,7 @@
 
     <sql id="queryPageSql">
         <where>
-            sci.del_flag_ != 1
+            sci.del_flag_ != 1 and sci.tenant_id_ = #{tenantId}
             <if test="organId != null">
                 AND FIND_IN_SET(sci.organ_id_,#{organId})
             </if>
@@ -181,7 +182,7 @@
         SELECT o.*
         FROM sporadic_charge_info sci
                  LEFT JOIN organization o ON o.id_ = sci.organ_id_
-        WHERE sci.charge_type_ = #{type}
+        WHERE sci.charge_type_ = #{type} and sci.tenant_id_ = #{tenantId}
           AND sci.del_flag_ = 0
         GROUP BY o.id_
     </select>
@@ -190,14 +191,14 @@
         SELECT o.id_ id,o.name_ name ,(SUM(sci.max_amount_)/COUNT(*)) maxAmount
         FROM sporadic_charge_info sci
         LEFT JOIN organization o ON o.id_ = sci.organ_id_
-        WHERE sci.charge_type_ = #{type}
+        WHERE sci.charge_type_ = #{type} and sci.tenant_id_ = #{tenantId}
         AND sci.del_flag_ = 0
         GROUP BY o.id_
     </select>
 
     <sql id="findSporadicChargeInfosCondition">
         <where>
-            del_flag_ = 0
+            del_flag_ = 0 and tenant_id_ = #{tenantId}
             <if test="organId!=null">
                 AND organ_id_=#{organId}
             </if>

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

@@ -17,6 +17,7 @@
         <result column="update_time_" property="updateTime"/>
         <result column="orig_payment_order_id_" property="origPaymentOrderId"/>
         <result column="remark_" property="remark"/>
+        <result column="tenant_id_" property="tenantId"/>
     </resultMap>
     
     <resultMap type="com.ym.mec.biz.dal.entity.StudentApplyRefunds" extends="StudentApplyRefunds" id="StudentApplyRefundsListDTO">
@@ -32,7 +33,7 @@
 
     <!-- 全查询 -->
     <select id="findAll" resultMap="StudentApplyRefunds">
-		SELECT * FROM student_apply_refunds ORDER BY id_
+		SELECT * FROM student_apply_refunds where tenant_id_ = #{tenantId} ORDER BY id_
 	</select>
 
     <!-- 向数据库增加一条记录 -->
@@ -44,8 +45,8 @@
         </selectKey>
         -->
         INSERT INTO student_apply_refunds
-        (id_,user_id_,order_no_,status_,expect_amount_,actual_amount_,create_time_,update_time_,orig_payment_order_id_,remark_)
-        VALUES(#{id},#{userId},#{orderNo},#{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{expectAmount},#{actualAmount},now(),now(),#{origPaymentOrderId},#{remark})
+        (id_,user_id_,order_no_,status_,expect_amount_,actual_amount_,create_time_,update_time_,orig_payment_order_id_,remark_, tenant_id_)
+        VALUES(#{id},#{userId},#{orderNo},#{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{expectAmount},#{actualAmount},now(),now(),#{origPaymentOrderId},#{remark},#{tenantId})
     </insert>
 
     <!-- 根据主键查询一条记录 -->
@@ -77,7 +78,7 @@
                 remark_ = #{remark},
             </if>
         </set>
-        WHERE id_ = #{id}
+        WHERE id_ = #{id} and tenant_id_ = #{tenantId}
     </update>
 
     <!-- 根据主键删除一条记录 -->
@@ -88,7 +89,7 @@
     <!-- 分页查询 -->
     <select id="queryPage" resultMap="StudentApplyRefundsListDTO" parameterType="map">
         SELECT sar.*,spo.expect_amount_,spo.actual_amount_,u.username_ FROM student_apply_refunds sar left join student_payment_order spo on sar.orig_payment_order_id_ = spo.id_ left join sys_user u on sar.user_id_ = u.id_
-        where 1=1 
+        where 1=1 and sar.tenant_id_ = #{tenantId}
         <if test="startTime != null">
             and DATE_FORMAT(sar.create_time_,"%Y-%m-%d") &gt;= DATE_FORMAT(#{startTime},"%Y-%m-%d")
         </if>
@@ -107,7 +108,7 @@
     <!-- 查询当前表的总记录数 -->
     <select id="queryCount" resultType="int" parameterType="map">
 		SELECT count(1) FROM student_apply_refunds sar left join student_payment_order spo on sar.orig_payment_order_id_ = spo.id_ left join sys_user u on sar.user_id_ = u.id_
-		where 1=1 
+		where 1=1 and sar.tenant_id_ = #{tenantId}
         <if test="startTime != null">
             and DATE_FORMAT(sar.create_time_,"%Y-%m-%d") &gt;= DATE_FORMAT(#{startTime},"%Y-%m-%d")
         </if>

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

@@ -41,6 +41,7 @@
         <result column="start_class_time_" property="courseSchedule.startClassTime"/>
         <result column="end_class_time_" property="courseSchedule.endClassTime"/>
         <result column="new_course_id_" property="courseSchedule.newCourseId"/>
+        <result column="tenant_id_" property="tenantId"/>
     </resultMap>
 
     <!-- 根据主键查询一条记录 -->
@@ -50,7 +51,7 @@
 
     <!-- 全查询 -->
     <select id="findAll" resultMap="StudentAttendance">
-		SELECT * FROM student_attendance ORDER BY id_
+		SELECT * FROM student_attendance where tenant_id_ = #{tenantId} ORDER BY id_
 	</select>
 
     <!-- 向数据库增加一条记录 -->
@@ -58,17 +59,17 @@
             keyColumn="id" keyProperty="id">
         INSERT INTO student_attendance
         (group_type_,music_group_id_,class_group_id_,course_schedule_id_,user_id_,teacher_id_,status_,create_time_,
-        update_time_,remark_,current_class_times_,sign_in_time_,sign_out_time_,current_schedule_id_,visit_flag_,normal_remind_)
+        update_time_,remark_,current_class_times_,sign_in_time_,sign_out_time_,current_schedule_id_,visit_flag_,normal_remind_,tenant_id_)
         VALUES(#{groupType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{musicGroupId},#{classGroupId},
         #{courseScheduleId},#{userId},#{teacherId},#{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},now(),now(),
         #{remark},#{currentClassTimes},#{signInTime},#{signOutTime},#{currentScheduleId},#{visitFlag,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-        #{normalRemind})
+        #{normalRemind},#{tenantId})
     </insert>
 
     <insert id="addStudentAttendances" parameterType="java.util.List" useGeneratedKeys="true" keyProperty="id_">
       INSERT INTO student_attendance (group_type_, music_group_id_, class_group_id_, course_schedule_id_,
       user_id_, teacher_id_, status_, create_time_,update_time_, remark_ ,current_class_times_,sign_in_time_,
-                                      sign_out_time_,current_schedule_id_,visit_flag_,normal_remind_)
+                                      sign_out_time_,current_schedule_id_,visit_flag_,normal_remind_,tenant_id_)
       VALUES
 	  <foreach collection="list" item="studentAttendance" separator=",">
           (#{studentAttendance.groupType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
@@ -78,7 +79,7 @@
           #{studentAttendance.remark},#{studentAttendance.currentClassTimes},
           #{studentAttendance.signInTime},#{studentAttendance.signOutTime},#{studentAttendance.currentScheduleId},
            #{studentAttendance.visitFlag,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-          #{studentAttendance.normalRemind})
+          #{studentAttendance.normalRemind},#{studentAttendance.tenantId})
       </foreach>
     </insert>
 
@@ -130,7 +131,7 @@
             </if>
             update_time_ = NOW()
         </set>
-        WHERE id_ = #{id}
+        WHERE id_ = #{id} and tenant_id_ = #{tenantId}
     </update>
     
     <update id="cleanCourseStudentSignOut">
@@ -277,7 +278,7 @@
 
     <sql id="queryCondition">
         <where>
-            (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL) AND cs.pre_course_flag_ = 0
+            (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL) AND cs.pre_course_flag_ = 0 and cs.tenant_id_ = #{tenantId}
             <if test="studentID != null">
                 and sa.user_id_ = #{studentID}
             </if>
@@ -485,7 +486,7 @@
     </select>
     <sql id="findStudentAttendanceSql">
         <where>
-            cs.del_flag_ = 0 AND cs.pre_course_flag_ = 0 AND cs.is_lock_ = 0
+            cs.del_flag_ = 0 AND cs.pre_course_flag_ = 0 AND cs.is_lock_ = 0 and cs.tenant_id_ = #{tenantId}
             <if test="visitFlag != null">
                 <if test="visitFlag == 1">
                     AND sa.visit_flag_ = 1
@@ -599,7 +600,7 @@
     </select>
     <sql id="exportStudentAttendancesQueryPageSql">
         <where>
-                cs.pre_course_flag_ = 0
+                cs.pre_course_flag_ = 0 and cs.tenant_id_ = #{tenantId}
             <if test="organId != null and organId != ''">
                 AND FIND_IN_SET(cs.organ_id_,#{organId})
             </if>

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

@@ -20,6 +20,7 @@
 		<result column="comment_" property="comment" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
+        <result column="tenant_id_" property="tenantId"/>
 	</resultMap>
 
 	<!-- 根据主键查询一条记录 -->
@@ -29,7 +30,7 @@
 
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="StudentCompetition">
-		SELECT * FROM student_competition ORDER BY id_
+		SELECT * FROM student_competition where tenant_id_ = #{tenantId} ORDER BY id_
 	</select>
 
 	<!-- 向数据库增加一条记录 -->
@@ -39,8 +40,8 @@
 		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL
 		</selectKey>
 		-->
-		INSERT INTO student_competition (id_,user_id_,username_,id_card_no_,age_,gender_,grade_,subject_,chapter_,picture_url_,video_url_,score_,prize_level_,is_show_,comment_,create_time_,update_time_)
-		VALUES(#{id},#{userId},#{username},#{idCardNo},#{age},#{gender},#{grade},#{subject},#{chapter},#{pictureUrl},#{videoUrl},#{score},#{prizeLevel},#{isShow},#{comment},NOW(),NOW())
+		INSERT INTO student_competition (id_,user_id_,username_,id_card_no_,age_,gender_,grade_,subject_,chapter_,picture_url_,video_url_,score_,prize_level_,is_show_,comment_,create_time_,update_time_,tenant_id_)
+		VALUES(#{id},#{userId},#{username},#{idCardNo},#{age},#{gender},#{grade},#{subject},#{chapter},#{pictureUrl},#{videoUrl},#{score},#{prizeLevel},#{isShow},#{comment},NOW(),NOW(),#{tenantId})
 	</insert>
 
 	<!-- 根据主键查询一条记录 -->
@@ -92,7 +93,7 @@
 			grade_ = #{grade},
 		</if>
 			update_time_ = NOW()
-	</set> WHERE id_ = #{id}
+	</set> WHERE id_ = #{id} and tenant_id_ = #{tenantId}
 	</update>
 	
 	<!-- 根据主键删除一条记录 -->
@@ -102,16 +103,17 @@
 
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="StudentCompetition" parameterType="map">
-		SELECT * FROM student_competition ORDER BY id_ <include refid="global.limit"/>
+		SELECT * FROM student_competition where tenant_id_ = #{tenantId} ORDER BY id_ <include refid="global.limit"/>
 	</select>
 
 	<!-- 查询当前表的总记录数 -->
 	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM student_competition
+		SELECT COUNT(*) FROM student_competition where tenant_id_ = #{tenantId}
 	</select>
 
 	<sql id="queryStudentCondition">
 		<where>
+			tenant_id_ = #{tenantId}
 			<if test="grade!=null">
 				AND grade_=#{grade}
 			</if>
@@ -169,7 +171,7 @@
 	</select>
 
 	<select id="getWinnerList" resultMap="StudentCompetition">
-		SELECT * FROM student_competition WHERE is_show_ = 1
+		SELECT * FROM student_competition WHERE is_show_ = 1 and tenant_id_ = #{tenantId}
 		ORDER BY ISNULL(score_),score_ DESC
 	</select>
 
@@ -178,6 +180,6 @@
 	</select>
 
 	<select id="getCompetitionsWithPrizeLevel" resultType="long">
-		SELECT id_ FROM student_competition WHERE prize_level_ = #{prizeLevel} FOR UPDATE
+		SELECT id_ FROM student_competition WHERE prize_level_ = #{prizeLevel} and tenant_id_ = #{tenantId} FOR UPDATE
 	</select>
 </mapper>

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

@@ -14,17 +14,18 @@
 		<result column="operator_" property="operator" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
+        <result column="tenant_id_" property="tenantId"/>
 	</resultMap>
 	
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="StudentCourseFeeDetail">
-		SELECT * FROM student_course_fee_detail
+		SELECT * FROM student_course_fee_detail where tenant_id_ = #{tenantId}
 	</select>
 	
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.StudentCourseFeeDetail" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		INSERT INTO student_course_fee_detail (student_registration_id_,amount_,surplus_course_fee_,memo_,operator_,create_time_,update_time_)
-		VALUES(#{studentRegistrationId},#{amount},#{surplusCourseFee},#{memo},#{operator},NOW(),NOW())
+		INSERT INTO student_course_fee_detail (student_registration_id_,amount_,surplus_course_fee_,memo_,operator_,create_time_,update_time_,tenant_id_)
+		VALUES(#{studentRegistrationId},#{amount},#{surplusCourseFee},#{memo},#{operator},NOW(),NOW(),#{tenantId})
 	</insert>
 
 	<update id="update" parameterType="com.ym.mec.biz.dal.entity.StudentCourseFeeDetail">
@@ -49,19 +50,19 @@
 	
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="StudentCourseFeeDetail" parameterType="map">
-		SELECT * FROM student_course_fee_detail <include refid="global.limit"/>
+		SELECT * FROM student_course_fee_detail where tenant_id_ = #{tenantId} <include refid="global.limit"/>
 	</select>
 	
 	<!-- 查询当前表的总记录数 -->
 	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM student_course_fee_detail
+		SELECT COUNT(*) FROM student_course_fee_detail where tenant_id_ = #{tenantId}
 	</select>
 
 	<insert id="batchInsert">
-		INSERT INTO student_course_fee_detail (student_registration_id_,amount_,surplus_course_fee_,memo_,operator_,create_time_,update_time_)
+		INSERT INTO student_course_fee_detail (student_registration_id_,amount_,surplus_course_fee_,memo_,operator_,create_time_,update_time_,tenant_id_)
 		VALUES
 		<foreach collection="studentCourseFeeDetails" item="item" separator=",">
-			(#{item.studentRegistrationId},#{item.amount},#{item.surplusCourseFee},#{item.memo},#{item.operator},NOW(),NOW())
+			(#{item.studentRegistrationId},#{item.amount},#{item.surplusCourseFee},#{item.memo},#{item.operator},NOW(),NOW(),#{item.tenantId})
 		</foreach>
     </insert>
 </mapper>

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

@@ -26,6 +26,7 @@
         <result column="submit_time_" property="submitTime"/>
         <result column="music_score_name_" property="musicScoreName"/>
         <result column="music_score_id_" property="musicScoreId"/>
+        <result column="tenant_id_" property="tenantId"/>
     </resultMap>
 
     <resultMap type="com.ym.mec.biz.dal.dto.CourseHomeworkStudentDetailDto" id="CourseHomeworkStudentDetailDto">
@@ -61,7 +62,7 @@
     <!-- 全查询 -->
     <select id="findAll" resultMap="StudentCourseHomework">
         SELECT *
-        FROM student_course_homework
+        FROM student_course_homework where tenant_id_ = #{tenantId}
         ORDER BY id_
     </select>
 
@@ -69,23 +70,23 @@
     <insert id="insert" parameterType="com.ym.mec.biz.dal.entity.StudentCourseHomework" useGeneratedKeys="true"
             keyColumn="id" keyProperty="id">
         INSERT INTO student_course_homework
-        (user_id_,course_schedule_id_,course_homework_id_,attachments_,score_,create_time_,update_time_,remark_,status_,is_replied_,is_view_,is_replied_timely_,music_score_id_)
+        (user_id_,course_schedule_id_,course_homework_id_,attachments_,score_,create_time_,update_time_,remark_,status_,is_replied_,is_view_,is_replied_timely_,music_score_id_,tenant_id_)
         VALUES(#{userId},#{courseScheduleId},#{courseHomeworkId},#{attachments},#{score},now(),now(),#{remark},
                #{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{isReplied,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-               #{isView,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{isRepliedTimely},#{musicScoreId})
+               #{isView,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{isRepliedTimely},#{musicScoreId},#{tenantId})
     </insert>
 
     <insert id="batchInsertStudentCourseHomeworkRecord" parameterType="java.util.List" useGeneratedKeys="true"
             keyColumn="id" keyProperty="id">
         INSERT INTO student_course_homework
         (user_id_,course_schedule_id_,course_homework_id_,attachments_,score_,create_time_,
-         update_time_,remark_,status_,is_replied_,is_view_,is_replied_timely_,music_score_id_)
+         update_time_,remark_,status_,is_replied_,is_view_,is_replied_timely_,music_score_id_,tenant_id_)
         VALUE
         <foreach collection="list" item="homework" separator=",">
             (#{homework.userId},#{homework.courseScheduleId},#{homework.courseHomeworkId},#{homework.attachments},
             #{homework.score},now(),now(),#{homework.remark},#{homework.status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
             #{homework.isReplied,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-            #{homework.isView,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{homework.isRepliedTimely},#{homework.musicScoreId})
+            #{homework.isView,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{homework.isRepliedTimely},#{homework.musicScoreId},#{homework.tenantId})
         </foreach>
     </insert>
 
@@ -128,7 +129,7 @@
                 submit_time_ = #{submitTime}
             </if>
         </set>
-        WHERE id_ = #{id}
+        WHERE id_ = #{id} and tenant_id_ = #{tenantId}
     </update>
 
     <!-- 根据主键删除一条记录 -->
@@ -161,7 +162,7 @@
 
     <sql id="queryCondition">
         <where>
-            (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL) AND cs.pre_course_flag_ = 0
+            (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL) AND cs.pre_course_flag_ = 0 and cs.tenant_id_ = #{tenantId}
             <if test="createTime != null">
                 AND DATE_FORMAT(ch.create_time_,"%Y%m%d") = DATE_FORMAT(#{createTime},"%Y%m%d")
             </if>
@@ -273,9 +274,7 @@
         student_course_homework sch
         LEFT JOIN sys_user su ON sch.user_id_=su.id_
         <where>
-            <if test="courseScheduleId!=null">
-                AND sch.course_schedule_id_=#{courseScheduleId}
-            </if>
+                sch.course_schedule_id_=#{courseScheduleId}
             <if test="homeworkId!=null">
                 AND sch.course_homework_id_=#{homeworkId}
             </if>
@@ -426,6 +425,7 @@
 
     <sql id="queryAllCondition">
         <where>
+        	tenant_id_ = #{tenantId}
             <if test="courseScheduleId!=null">
                 AND course_schedule_id_=#{courseScheduleId}
             </if>
@@ -563,12 +563,10 @@
                 LEFT JOIN student_course_homework sch ON ch.id_ = sch.course_homework_id_
                 LEFT JOIN student_registration sr ON sch.user_id_=sr.user_id_ AND ch.music_group_id_=sr.music_group_id_
         WHERE sr.music_group_status_='NORMAL'
-            <if test="groupIds!=null and groupIds.size()>0">
                 AND ch.music_group_id_ IN
                 <foreach collection="groupIds" item="groupId" open="(" close=")" separator=",">
                     #{groupId}
                 </foreach>
-            </if>
             <if test="startTime!=null">
                 AND cs.class_date_ &gt;= DATE_FORMAT(#{startTime}, "%Y-%m-%d")
             </if>
@@ -602,6 +600,7 @@
 
     <sql id="homeWorkCondition">
         <where>
+        	sch.tenant_id_ = #{tenantId}
             <if test="userId!=null">
                 AND sch.user_id_=#{userId}
             </if>

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

@@ -14,6 +14,7 @@
         <result column="create_time_" property="createTime"/>
         <result column="parent_id_" property="parentId"/>
         <result column="msg_type_" property="msgType" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
+        <result column="tenant_id_" property="tenantId"/>
     </resultMap>
 
     <resultMap id="studentCourseHomeworkComment" type="com.ym.mec.biz.dal.dto.StudentCourseHomeworkCommentDto">
@@ -34,15 +35,15 @@
 
     <!-- 全查询 -->
     <select id="findAll" resultMap="StudentCourseHomeworkReply">
-		SELECT * FROM student_course_homework_reply ORDER BY id_
+		SELECT * FROM student_course_homework_reply where tenant_id_ = #{tenantId} ORDER BY id_
 	</select>
 
     <!-- 向数据库增加一条记录 -->
     <insert id="insert" parameterType="com.ym.mec.biz.dal.entity.StudentCourseHomeworkReply" useGeneratedKeys="true"
             keyColumn="id" keyProperty="id">
         INSERT INTO student_course_homework_reply
-        (id_,student_course_homework_id_,user_id_,content_,create_time_,parent_id_,msg_type_)
-        VALUES(#{id},#{studentCourseHomeworkId},#{userId},#{content},now(),#{parentId},#{msgType, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler})
+        (id_,student_course_homework_id_,user_id_,content_,create_time_,parent_id_,msg_type_,tenant_id_)
+        VALUES(#{id},#{studentCourseHomeworkId},#{userId},#{content},now(),#{parentId},#{msgType, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{tenantId})
     </insert>
 
     <!-- 根据主键查询一条记录 -->
@@ -65,7 +66,7 @@
                 content_ = #{content},
             </if>
         </set>
-        WHERE id_ = #{id}
+        WHERE id_ = #{id} and tenant_id_ = #{tenantId}
     </update>
 
     <!-- 根据主键删除一条记录 -->
@@ -96,6 +97,7 @@
 
     <sql id="queryCondition">
         <where>
+        	schr.tenant_id_ = #{tenantId}
             <if test="parentID!=null">
                 AND schr.parent_id_ = #{parentID}
             </if>

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

@@ -25,6 +25,7 @@
 		<result column="course_ids_" property="courseIds"/>
 		<result column="not_over_course_ids_" property="notOverCourseIds"/>
 		<result column="not_over_course_num_" property="notOverCourseNum"/>
+        <result column="tenant_id_" property="tenantId"/>
 	</resultMap>
 
 	<resultMap id="StudentExercisesSituationDto" type="com.ym.mec.biz.dal.dto.StudentExercisesSituationDto" extends="StudentExtracurricularExercisesSituation">
@@ -41,7 +42,7 @@
 
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="StudentExtracurricularExercisesSituation">
-		SELECT * FROM student_extracurricular_exercises_situation_ ORDER BY id_
+		SELECT * FROM student_extracurricular_exercises_situation_ where tenant_id_ = #{tenantId} ORDER BY id_
 	</select>
 
 	<!-- 向数据库增加一条记录 -->
@@ -54,21 +55,21 @@
 		INSERT INTO student_extracurricular_exercises_situation_ (id_,student_id_,week_of_year_,monday_,sunday_,teacher_id_,expect_exercises_num_,
 		                                                          actual_exercises_num_,exercises_reply_num_,exercises_message_num_,
 		                                                          exercises_message_timely_num_,create_time_,update_time_,last_submit_time_,
-		                                                          serve_type_,course_ids_,not_over_course_ids_,not_over_course_num_)
+		                                                          serve_type_,course_ids_,not_over_course_ids_,not_over_course_num_,tenant_id_)
 		VALUES(#{id},#{studentId},#{weekOfYear},#{monday},#{sunday},#{teacherId},#{expectExercisesNum},#{actualExercisesNum},#{exercisesReplyNum},
-		       #{exercisesMessageNum},#{exercisesMessageTimelyNum},NOW(),NOW(),#{lastSubmitTime},#{serveType},#{courseIds},#{notOverCourseIds},#{notOverCourseNum})
+		       #{exercisesMessageNum},#{exercisesMessageTimelyNum},NOW(),NOW(),#{lastSubmitTime},#{serveType},#{courseIds},#{notOverCourseIds},#{notOverCourseNum},#{tenantId})
 	</insert>
 
 	<insert id="batchInsert" parameterType="com.ym.mec.biz.dal.entity.StudentExtracurricularExercisesSituation" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
 		INSERT INTO student_extracurricular_exercises_situation_ (student_id_,week_of_year_,monday_,sunday_,teacher_id_,expect_exercises_num_,
 		                                                          actual_exercises_num_,exercises_reply_num_,exercises_message_num_,
 		                                                          exercises_message_timely_num_,create_time_,update_time_,last_submit_time_,
-		                                                          serve_type_,course_ids_,not_over_course_ids_,not_over_course_num_)
+		                                                          serve_type_,course_ids_,not_over_course_ids_,not_over_course_num_,tenant_id_)
 		VALUES
 		<foreach collection="situations" item="situation" separator=",">
 			(#{situation.studentId},#{situation.weekOfYear},#{situation.monday},#{situation.sunday},#{situation.teacherId},#{situation.expectExercisesNum},
 			#{situation.actualExercisesNum},#{situation.exercisesReplyNum},#{situation.exercisesMessageNum},#{situation.exercisesMessageTimelyNum},
-			NOW(),NOW(),#{situation.lastSubmitTime},#{situation.serveType},#{situation.courseIds},#{situation.notOverCourseIds},#{situation.notOverCourseNum})
+			NOW(),NOW(),#{situation.lastSubmitTime},#{situation.serveType},#{situation.courseIds},#{situation.notOverCourseIds},#{situation.notOverCourseNum},#{situation.tenantId})
 		</foreach>
 	</insert>
 
@@ -128,7 +129,7 @@
 				not_over_course_num_=#{notOverCourseNum},
 			</if>
 			update_time_ = #{updateTime}
-		</set> WHERE id_ = #{id}
+		</set> WHERE id_ = #{id} and tenant_id_ = #{tenantId}
 	</update>
 
 	<update id="batchUpdate" parameterType="com.ym.mec.biz.dal.entity.StudentExtracurricularExercisesSituation">
@@ -181,7 +182,7 @@
 					not_over_course_num_=#{situation.notOverCourseNum},
 				</if>
 				update_time_ = NOW()
-			</set> WHERE id_ = #{situation.id}
+			</set> WHERE id_ = #{situation.id} and tenant_id_ = #{situation.tenantId}
 		</foreach>
 	</update>
 
@@ -207,12 +208,12 @@
 
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="StudentExtracurricularExercisesSituation" parameterType="map">
-		SELECT * FROM student_extracurricular_exercises_situation_ ORDER BY id_ <include refid="global.limit"/>
+		SELECT * FROM student_extracurricular_exercises_situation_ where tenant_id_ = #{tenantId} ORDER BY id_ <include refid="global.limit"/>
 	</select>
 
 	<!-- 查询当前表的总记录数 -->
 	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM student_extracurricular_exercises_situation_
+		SELECT COUNT(*) FROM student_extracurricular_exercises_situation_ where tenant_id_ = #{tenantId}
 	</select>
 
 	<select id="findExercisesSituations" resultMap="StudentExercisesSituationDto">
@@ -248,7 +249,7 @@
 			LEFT JOIN organization o ON stu.organ_id_=o.id_
 		WHERE
 		sees.monday_ &gt;= #{monday}
-		AND sees.sunday_ &lt;= #{sunday}
+		AND sees.sunday_ &lt;= #{sunday} and sees.tenant_id_ = #{tenantId}
 		<if test="teacherId!=null">
 			AND sees.teacher_id_ = #{teacherId}
 		</if>
@@ -342,7 +343,7 @@
 		LEFT JOIN organization o ON stu.organ_id_=o.id_
 		WHERE
 		sees.monday_ &gt;= #{monday}
-		AND sees.sunday_ &lt;= #{sunday}
+		AND sees.sunday_ &lt;= #{sunday} and sees.tenant_id_ = #{tenantId}
 		<if test="teacherId!=null">
 			AND sees.teacher_id_ = #{teacherId}
 		</if>
@@ -448,7 +449,10 @@
 	</select>
 
 	<select id="findLastWeekTodayUpdateNum" resultType="int">
-		SELECT COUNT(id_) FROM student_extracurricular_exercises_situation_ WHERE sunday_=#{sunday} AND DATE_FORMAT(update_time_,'%Y-%m-%d')=DATE_FORMAT(NOW(),'%Y-%m-%d')
+		SELECT COUNT(id_) FROM student_extracurricular_exercises_situation_ WHERE sunday_=#{sunday} AND DATE_FORMAT(update_time_,'%Y-%m-%d')=DATE_FORMAT(NOW(),'%Y-%m-%d') 
+        <if test="tenantId != null">
+        and tenant_id_ = #{tenantId}
+        </if>
     </select>
 
 	<select id="findStudentExercisesSituationsWithMonDay" resultMap="StudentExtracurricularExercisesSituation">
@@ -471,18 +475,19 @@
 	</select>
 
 	<select id="countWeekServiceNum" resultType="int">
-		SELECT COUNT(id_) FROM student_extracurricular_exercises_situation_ WHERE monday_=#{monday}
+		SELECT COUNT(id_) FROM student_extracurricular_exercises_situation_ WHERE monday_=#{monday} 
+        <if test="tenantId != null">
+        and tenant_id_ = #{tenantId}
+        </if>
 	</select>
 
 	<select id="findWeekServiceWithStudents" resultMap="StudentExtracurricularExercisesSituation">
 		SELECT * FROM student_extracurricular_exercises_situation_
 		<where>
+			teacher_id_=#{teacherId}
 			<if test="monday != null and monday != ''">
 				AND monday_ = #{monday}
 			</if>
-			<if test="teacherId!=null">
-				AND teacher_id_=#{teacherId}
-			</if>
 			<if test="studentIds!=null and studentIds.size()>0">
 				AND student_id_ IN
 				<foreach collection="studentIds" item="studentId" open="(" close=")" separator=",">
@@ -531,6 +536,7 @@
 
 	<sql id="queryTeacherServeInfoCondition">
 		<where>
+			sees.tenant_id_ = #{tenantId}
 			<if test="organIds!=null and organIds.size()>0">
 				AND tea.organ_id_ IN
 				<foreach collection="organIds" item="organId" open="(" close=")" separator=",">
@@ -681,12 +687,10 @@
 			<if test="serveType!=null and serveType!=''">
 				AND serve_type_=#{serveType}
 			</if>
-		  <if test="teacherIds!=null and teacherIds.size()>0">
 			  AND teacher_id_ IN
 			  <foreach collection="teacherIds" item="teacherId" open="(" close=")" separator=",">
 				  #{teacherId}
 			  </foreach>
-		  </if>
 	</select>
 
 	<select id="getHomeworkData" resultMap="com.ym.mec.biz.dal.dao.IndexBaseMonthDataDao.IndexBaseMonthData">

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

@@ -22,6 +22,7 @@
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
 		<result column="coupon_ids_" property="couponIds" />
+        <result column="tenant_id_" property="tenantId"/>
 	</resultMap>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -33,15 +34,15 @@
 	
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="StudentGoodsSell">
-		SELECT * FROM student_goods_sell ORDER BY id_
+		SELECT * FROM student_goods_sell where tenant_id_ = #{tenantId} ORDER BY id_
 	</select>
 
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.StudentGoodsSell" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
 		INSERT INTO student_goods_sell (user_id_,teacher_id_,goods_json_,total_amount_,market_amount_,
-		create_time_,update_time_,order_no_,organ_id_,author_user_,cooperation_organ_id_,coupon_market_amount_,coupon_ids_)
+		create_time_,update_time_,order_no_,organ_id_,author_user_,cooperation_organ_id_,coupon_market_amount_,coupon_ids_,tenant_id_)
 		VALUES(#{userId},#{teacherId},#{goodsJson},#{totalAmount},#{marketAmount},
-		NOW(),NOW(),#{orderNo},#{organId},#{authorUser},#{cooperationOrganId},#{couponMarketAmount},#{couponIds})
+		NOW(),NOW(),#{orderNo},#{organId},#{authorUser},#{cooperationOrganId},#{couponMarketAmount},#{couponIds},#{tenantId})
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -81,7 +82,7 @@
 			goods_json_ = #{goodsJson},
 		</if>
 		update_time_ = NOW()
-		</set> WHERE id_ = #{id}
+		</set> WHERE id_ = #{id} and tenant_id_ = #{tenantId}
 	</update>
 	<update id="autoAffirmReceive">
 		UPDATE student_payment_order SET receive_status_ = #{status},update_time_ = NOW() WHERE FIND_IN_SET(order_no_,#{orderNo})
@@ -94,12 +95,12 @@
 	
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="StudentGoodsSell" parameterType="map">
-		SELECT * FROM student_goods_sell ORDER BY id_ <include refid="global.limit"/>
+		SELECT * FROM student_goods_sell where tenant_id_ = #{tenantId} ORDER BY id_ <include refid="global.limit"/>
 	</select>
 	
 	<!-- 查询当前表的总记录数 -->
 	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM student_goods_sell
+		SELECT COUNT(*) FROM student_goods_sell where tenant_id_ = #{tenantId}
 	</select>
     <select id="countStudentGoodsOrders" resultType="java.lang.Integer">
 		SELECT COUNT(spo.id_) FROM student_payment_order spo
@@ -116,6 +117,7 @@
 	</resultMap>
 	<sql id="queryStudentGoodsOrdersSql">
 		<where>
+			sgs.tenant_id_ = #{tenantId}
 			<if test="teacherId != null">
 				sgs.teacher_id_ = #{teacherId}
 			</if>
@@ -153,7 +155,7 @@
     <select id="queryNoAffirmOrderNo" resultType="java.lang.String">
 		SELECT GROUP_CONCAT(DISTINCT so.order_no_) FROM sell_order so
 		LEFT JOIN student_payment_order spo ON spo.order_no_ = so.order_no_
-		WHERE spo.status_ = 'SUCCESS' AND spo.receive_status_ = 'NO_RECEIVE'
+		WHERE spo.status_ = 'SUCCESS' AND spo.receive_status_ = 'NO_RECEIVE' and spo.tenant_id_ = #{tenantId}
 		<if test="autoAffirmReceiveTime != null and autoAffirmReceiveTime != ''">
 			AND TIMESTAMPDIFF(DAY,spo.pay_time_,NOW()) >= #{autoAffirmReceiveTime}
 		</if>
@@ -166,7 +168,7 @@
 	</resultMap>
 	<sql id="queryStudentPaymentOrdersSql">
 		<where>
-				spo.type_ IN ('GOODS_SELL','APPLY','SUBJECT_CHANGE') AND so.id_ IS NOT NULL
+				spo.type_ IN ('GOODS_SELL','APPLY','SUBJECT_CHANGE') AND so.id_ IS NOT NULL and spo.tenant_id_ = #{tenantId}
 			<if test="status != null">
 				AND spo.status_ = #{status}
 			</if>

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

@@ -23,6 +23,7 @@
         <result column="specification_" property="specification"/>
         <result column="goods_brand_" property="goodsBrand"/>
         <result column="goods_img_" property="goodsImg"/>
+        <result column="tenant_id_" property="tenantId"/>
     </resultMap>
 
     <select id="get" parameterType="java.lang.Long" resultMap="StudentInstrument">
@@ -41,11 +42,11 @@
         <!--@mbg.generated-->
         insert into student_instrument
         (student_id_,organ_id_,goods_id_,goods_category_id_,goods_category_name_,goods_name_,goods_brand_,specification_,goods_img_,
-        status_,order_id_,change_order_id_,operation_, start_time_, end_time_, create_time_, update_time
+        status_,order_id_,change_order_id_,operation_, start_time_, end_time_, create_time_, update_time,tenant_id_
         )
         values
         (#{studentId},#{organId},#{goodsId},#{goodsCategoryId},#{goodsCategoryName},#{goodsName},#{goodsBrand},#{specification},#{goodsImg},
-        #{status},#{orderId},#{changeOrderId},#{operation}, #{startTime}, #{endTime}, NOW(), NOW()
+        #{status},#{orderId},#{changeOrderId},#{operation}, #{startTime}, #{endTime}, NOW(), NOW(),#{tenantId}
         )
     </insert>
     <update id="update" parameterType="com.ym.mec.biz.dal.entity.StudentInstrument">
@@ -98,7 +99,7 @@
             </if>
             update_time = NOW(),
         </set>
-        where id_ = #{id}
+        where id_ = #{id} and tenant_id_ = #{tenantId}
     </update>
     
     <update id="batchModify" parameterType="com.ym.mec.biz.dal.entity.StudentInstrument">
@@ -152,14 +153,14 @@
             </if>
             update_time = NOW(),
         </set>
-        where id_ = #{studentInstrument.id}
+        where id_ = #{studentInstrument.id} and tenant_id_ = #{studentInstrument.tenantId}
         </foreach>
     </update>
 
     <!-- 全查询 -->
     <select id="findAll" resultMap="StudentInstrument">
         SELECT *
-        FROM student
+        FROM student where tenant_id_ = #{tenantId}
     </select>
 
     <!-- 分页查询 -->
@@ -181,6 +182,7 @@
 
     <sql id="queryPageSql">
         <where>
+        	tenant_id_ = #{tenantId}
             <if test="studentId != null">
                 AND si.student_id_ = #{studentId}
             </if>
@@ -212,12 +214,12 @@
     <insert id="batchAdd" parameterType="java.util.List" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
         insert into student_instrument
         (student_id_,organ_id_,goods_id_,goods_category_id_,goods_category_name_,goods_name_,goods_brand_,specification_,goods_img_,
-        order_id_,change_order_id_,status_, start_time_, end_time_, create_time_, update_time)
+        order_id_,change_order_id_,status_, start_time_, end_time_, create_time_, update_time,tenant_id_)
         VALUE
         <foreach collection="studentInstruments" item="item" separator=",">
             (#{item.studentId},#{item.organId},#{item.goodsId},#{item.goodsCategoryId},#{item.goodsCategoryName},#{item.goodsName},#{item.goodsBrand},#{item.specification},#{item.goodsImg},
             #{item.orderId},#{item.changeOrderId},#{item.status}, #{item.startTime},
-            #{item.endTime}, NOW(), NOW())
+            #{item.endTime}, NOW(), NOW(),#{item.tenantId})
         </foreach>
     </insert>
 
@@ -275,13 +277,11 @@
         WHERE spo.status_ = 'SUCCESS'
         AND spod2.type_ = 'MUSICAL'
         AND (
-        <if test="goodsIds != null and goodsIds.size() != 0">
             spod.goods_id_list_ IN
             <foreach collection="goodsIds" item="goodsId" open="(" close=")" separator=",">
                 #{goodsId}
             </foreach>
             OR
-        </if>
         FIND_IN_SET('76', spod.goods_id_list_)
         )
         <if test="startTime != null ">
@@ -305,7 +305,7 @@
         LEFT JOIN student_instrument si ON si.id_ = spod.student_instrument_id_
         LEFT JOIN organization o ON spo.organ_id_ = o.id_
         LEFT JOIN sys_user su ON su.id_ = si.student_id_
-        WHERE spo.status_ = 'SUCCESS' AND spod.type_='MAINTENANCE'
+        WHERE spo.status_ = 'SUCCESS' AND spod.type_='MAINTENANCE' and spo.tenant_id_ = #{tenantId}
         <if test="startTime != null ">
             AND spo.create_time_ >= #{startTime}
         </if>

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

@@ -80,25 +80,6 @@
         <result column="record_user_id_" property="recordUserId"/>
     </resultMap>
 
-    <sql id="queryCondition">
-        <where>
-            cgsm.user_id_ IS NOT NULL
-            <if test="organID != null">
-              AND s.organ_id_=#{organID}
-            </if>
-            <if test="musicGroupId != null">
-                and mg.id_ = #{musicGroupId}
-            </if>
-            <if test="studentStatus != null">
-                and cgsm.status_ = #{studentStatus, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
-            </if>
-            <if test="queryString != null">
-                and (su.username_ like CONCAT("%",#{queryString},"%")
-                    or su.phone_ like CONCAT("%",#{queryString},"%")
-                  )
-            </if>
-        </where>
-    </sql>
     <update id="updateUser" parameterType="com.ym.mec.auth.api.entity.SysUser">
         UPDATE sys_user
         <set>
@@ -160,7 +141,7 @@
                 real_name_ = #{realName},
             </if>
         </set>
-        WHERE id_ = #{id}
+        WHERE id_ = #{id} and tenant_id_ = #{tenantId}
     </update>
 
     <select id="findStudentsByOrganId" resultMap="studentManageListDto">
@@ -193,7 +174,7 @@
     </select>
     <sql id="findStudentsByOrganIdSql">
         <where>
-                su.del_flag_ = 0
+                su.del_flag_ = 0 and s.tenant_id_ = #{tenantId}
             <if test="organIds != null and organIds.length>0">
                 AND su.organ_id_ IN
                 <foreach collection="organIds" item="organId" open="(" close=")" separator=",">
@@ -322,7 +303,7 @@
     <sql id="studentManageCourseQueryCondition">
         <where>
             (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL) AND cs.pre_course_flag_ = 0
-            AND cgsm.status_ != 'QUIT'
+            AND cgsm.status_ != 'QUIT' and cg.tenant_id_ = #{tenantId}
             <if test="studentId!=null">
                 and cgsm.user_id_ = #{studentId}
             </if>
@@ -375,7 +356,7 @@
 
     <sql id="studentManageAttendanceQueryCondition">
         <where>
-            (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL) AND cs.pre_course_flag_ = 0
+            (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL) AND cs.pre_course_flag_ = 0 and cssp.tenant_id_ = #{tenantId}
             <if test="studentId!=null">
                 AND cssp.user_id_ = #{studentId}
             </if>
@@ -476,7 +457,7 @@
     </select>
     <sql id="studentPaymentSql">
         <where>
-            (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL) AND cs.pre_course_flag_ = 0
+            (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL) AND cs.pre_course_flag_ = 0 and cssp.tenant_id_ = #{tenantId}
             AND cs.id_ IS NOT NULL AND CONCAT(cs.class_date_,' ',cs.start_class_time_) &lt; NOW()
             <if test="classGroupType != null">
                 AND cs.type_ = #{classGroupType}
@@ -502,6 +483,7 @@
 
     <sql id="queryMusicGroupStudentSql">
         <where>
+        	sr.tenant_id_ = #{tenantId}
             <if test="hasMember != null">
                 <if test="hasMember == 0">
                     AND stu.member_rank_setting_id_ IS NULL
@@ -675,7 +657,7 @@
 
     <sql id="queryMusicGroupStudentsSignSql">
         <where>
-            (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL) AND cs.pre_course_flag_ = 0
+            (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL) AND cs.pre_course_flag_ = 0 and sa.tenant_id_ = #{tenantId}
             <if test="musicGroupId != null">
                 AND sa.music_group_id_ = #{musicGroupId}
             </if>
@@ -749,41 +731,6 @@
             AND vg.group_status_ = #{vipGroupStatus}
         </if>
     </select>
-    <sql id="queryHasCourseSql">
-        <if test="userIds != null">
-            AND su.id_ IN
-            <foreach collection="userIds" open="(" close=")" separator="," item="item">
-                #{item}
-            </foreach>
-        </if>
-        <if test="organId != null and organId != ''">
-            AND FIND_IN_SET(su.organ_id_,#{organId})
-        </if>
-        <if test="search != null and search != ''">
-            AND (su.phone_ LIKE CONCAT('%',#{search},'%') OR su.username_ LIKE CONCAT('%',#{search},'%') OR su.id_ LIKE CONCAT('%',#{search},'%'))
-        </if>
-        <if test="isActive != null and isActive == true">
-            AND su.password_ IS NOT NULL
-        </if>
-        <if test="isActive != null and isActive == false">
-            AND su.password_ IS NULL
-        </if>
-        <if test="isMake != null and isMake == true">
-            AND pla.id_ IS NOT NULL
-        </if>
-        <if test="isMake != null and isMake == false">
-            AND pla.id_ IS NULL
-        </if>
-        <if test="operatingTag != null">
-            AND st.operating_tag_ = #{operatingTag}
-        </if>
-        <if test="serviceTag != null">
-            AND st.service_tag_ = #{serviceTag}
-        </if>
-        <if test="teacherId != null">
-            AND st.teacher_id_ = #{teacherId}
-        </if>
-    </sql>
     <resultMap id="StudentHasCourseDtoMap" type="com.ym.mec.biz.dal.dto.StudentHasCourseDto">
         <result property="userName" column="username_"/>
         <result property="musicGroupName" column="music_group_name_"/>
@@ -827,7 +774,7 @@
         LEFT JOIN course_schedule_student_payment cssp1 ON su.id_ = cssp1.user_id_ AND cssp1.group_type_ = 'PRACTICE'
         LEFT JOIN class_group_student_mapper cgsm ON su.id_ = cgsm.user_id_ AND cgsm.group_type_ = 'VIP'
         LEFT JOIN sys_user_cash_account suca ON su.id_ = suca.user_id_
-        WHERE su.user_type_ LIKE '%STUDENT%' AND cs.pre_course_flag_ = 0
+        WHERE su.user_type_ LIKE '%STUDENT%' AND cs.pre_course_flag_ = 0 and su.tenant_id_ = #{tenantId}
         <if test="hasPracticeCourse != null and hasPracticeCourse == true">
             AND cssp1.id_ IS NOT NULL
         </if>
@@ -870,20 +817,6 @@
         SELECT COUNT(id_) FROM student_course_homework WHERE course_schedule_id_ = #{courseScheduleId} AND is_replied_ = 1 AND status_ = 1
     </select>
 
-    <sql id="queryHasPracticeCourseSql">
-        <if test="organId != null">
-            AND FIND_IN_SET(su.organ_id_,#{organId})
-        </if>
-        <if test="search != null and search != ''">
-            AND (su.phone_ LIKE CONCAT('%',#{search},'%') OR su.username_ LIKE CONCAT('%',#{search},'%') OR su.id_ LIKE CONCAT('%',#{search},'%'))
-        </if>
-        <if test="isActive != null and isActive == true">
-            AND su.password_ IS NOT NULL
-        </if>
-        <if test="isActive != null and isActive == false">
-            AND su.password_ IS NULL
-        </if>
-    </sql>
     <select id="getHasPracticeCourse" resultType="java.util.Map">
         SELECT cssp.user_id_ 'key',COUNT(DISTINCT cssp.user_id_) 'value' FROM course_schedule_student_payment cssp
         WHERE cssp.group_type_ = 'PRACTICE' AND cssp.user_id_ IN

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

@@ -35,6 +35,7 @@
         <result column="phone_" property="phone"/>
         <result column="username_" property="username"/>
         <result column="count_flag_" property="countFlag"/>
+        <result column="tenant_id_" property="tenantId"/>
     </resultMap>
 
     <!-- 根据主键查询一条记录 -->
@@ -53,7 +54,7 @@
     <!-- 全查询 -->
     <select id="findAll" resultMap="Student">
         SELECT *
-        FROM student
+        FROM student where tenant_id_ = #{tenantId}
     </select>
 
     <select id="lockUser" resultType="int" useCache="false" flushCache="true">
@@ -86,7 +87,7 @@
             operating_tag_,
         </if>
         teacher_id_,create_time_,update_time_,service_tag_update_time_,cooperation_organ_id_,
-        care_package_,come_on_package_,member_rank_setting_id_,membership_start_time_,membership_end_time_,current_grade_num_,current_class_)
+        care_package_,come_on_package_,member_rank_setting_id_,membership_start_time_,membership_end_time_,current_grade_num_,current_class_,tenant_id_)
         VALUES
         (#{userId},#{schoolName},#{subjectIdList},
         <if test="serviceTag != null">
@@ -96,7 +97,7 @@
             #{operatingTag},
         </if>
         #{teacherId},NOW(),NOW(),NOW(),#{cooperationOrganId},
-         #{carePackage},#{comeOnPackage},#{memberRankSettingId},#{membershipStartTime},#{membershipEndTime},#{currentGradeNum},#{currentClass})
+         #{carePackage},#{comeOnPackage},#{memberRankSettingId},#{membershipStartTime},#{membershipEndTime},#{currentGradeNum},#{currentClass},#{tenantId})
     </insert>
 
     <update id="update" parameterType="com.ym.mec.biz.dal.entity.Student">
@@ -160,7 +161,7 @@
                 cooperation_organ_id_=#{cooperationOrganId},
                 update_time_ = NOW()
         </set>
-        WHERE user_id_ = #{userId}
+        WHERE user_id_ = #{userId} and tenant_id_ = #{tenantId}
     </update>
 
     <update id="updateStudentMember" parameterType="com.ym.mec.biz.dal.entity.Student">
@@ -193,6 +194,7 @@
     </select>
     <sql id="queryPageSql">
         <where>
+        	s.tenant_id_ = #{tenantId}
             <if test="organId != null and organId != ''">
                 AND FIND_IN_SET(su.organ_id_,#{organId})
             </if>
@@ -213,6 +215,7 @@
     </select>
     <sql id="studentQueryCondition">
         <where>
+        	tenant_id_ = #{tenantId}
             <if test="organIdList!=null">
                 organ_id_ IN
                 <foreach collection="organIdList" item="organId" open="(" close=")" separator=",">
@@ -283,7 +286,7 @@
 	            </if>
                 update_time_ = NOW()
             </set>
-            WHERE user_id_ = #{item.userId}
+            WHERE user_id_ = #{item.userId} and tenant_id_ = #{tenantId}
         </foreach>
     </update>
     <update id="updateStudentServiceOrOperatingTag">
@@ -419,7 +422,7 @@
 
     <sql id="student4OperatingQueryCondition">
         <where>
-            su.user_type_ LIKE '%STUDENT%'
+            su.user_type_ LIKE '%STUDENT%' and su.tenant_id_ = #{tenantId}
             <if test="search != null and search != ''">
                 AND (su.phone_ LIKE CONCAT('%',#{search},'%') OR su.username_ LIKE CONCAT('%',#{search},'%') OR su.id_
                 LIKE CONCAT('%',#{search},'%'))
@@ -510,7 +513,7 @@
     <select id="getServiceStudents" resultMap="Student">
         SELECT su.id_ user_id_,s.teacher_id_ FROM sys_user su
         LEFT JOIN student s ON s.user_id_=su.id_
-        WHERE s.service_tag_=1 AND FIND_IN_SET('STUDENT', su.user_type_)
+        WHERE s.service_tag_=1 AND FIND_IN_SET('STUDENT', su.user_type_) and s.tenant_id_ = #{tenantId}
     </select>
 
     <resultMap id="StudentServeDto" type="com.ym.mec.biz.dal.dto.StudentServeDto" extends="Student">
@@ -518,23 +521,6 @@
         <result column="teach_mode_" property="teachMode" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result property="courseStartTime" column="course_start_time_"/>
     </resultMap>
-    <select id="getBeServiceStudents" resultMap="StudentServeDto">
-        SELECT
-            s.user_id_,
-            s.teacher_id_,
-            cs.group_type_,
-            cs.teach_mode_,
-            IF(CONCAT( cs.class_date_, ' ', cs.end_class_time_ )&lt;#{courseExpireDate} AND (sa.status_ != 'NORMAL' OR sa.status_ IS NULL), NULL, cs.class_date_) course_start_time_
-        FROM
-            student s
-            LEFT JOIN course_schedule_student_payment cssp ON cssp.user_id_ = s.user_id_
-	        LEFT JOIN student_attendance sa ON cssp.course_schedule_id_=sa.course_schedule_id_ AND sa.user_id_=cssp.user_id_
-            LEFT JOIN course_schedule cs ON cs.id_ = cssp.course_schedule_id_
-            AND cs.group_type_ IN ('VIP', 'PRACTICE')
-            AND CONCAT( cs.class_date_, ' ', cs.start_class_time_ ) > #{monday}
-        WHERE
-            s.service_tag_ = 1
-    </select>
     <select id="getBeServiceStudentsInfoWithStudents" resultMap="StudentServeDto">
         SELECT
             s.user_id_,
@@ -580,6 +566,9 @@
         FROM student stu
           LEFT JOIN sys_user su ON stu.user_id_=su.id_
         WHERE service_tag_=1 AND su.del_flag_=0
+        <if test="tenantId != null">
+        and tenant_id_ = #{tenantId}
+        </if>
     </select>
     <select id="getServeStudentCourseStartTimes" resultType="com.ym.mec.biz.dal.dto.StudentServeCourseDto">
         SELECT
@@ -589,7 +578,7 @@
         FROM course_schedule_student_payment cssp
             LEFT JOIN course_schedule cs ON cs.id_=cssp.course_schedule_id_
             LEFT JOIN student stu ON cssp.user_id_ = stu.user_id_
-        WHERE stu.service_tag_=1 AND class_date_&gt;=#{monday}
+        WHERE stu.service_tag_=1 AND class_date_&gt;=#{monday} and cssp.tenant_id_ = #{tenantId}
     </select>
 
     <resultMap id="StudentServeCourseDto" type="com.ym.mec.biz.dal.dto.StudentServeCourseDto">
@@ -629,12 +618,10 @@
             AND cs.class_date_&gt;=#{monday}
             AND cs.type_ IN ('SINGLE', 'TRAINING_SINGLE', 'VIP', 'MIX', 'TRAINING_MIX', 'PRACTICE')
             AND cssp.create_time_&lt;#{nextMonday}
-            <if test="studentIds!=null and studentIds.size()>0">
                 AND cssp.user_id_ IN
                 <foreach collection="studentIds" item="studentId" open="(" close=")" separator=",">
                     #{studentId}
                 </foreach>
-            </if>
         ORDER BY cssp.user_id_,course_start_time_
     </select>
 
@@ -653,12 +640,10 @@
             AND mg.organ_id_ IS NOT NULL
             AND mg.status_ = 'PROGRESS'
             AND sr.music_group_status_ = 'NORMAL'
-            <if test="noCourseStudentIds!=null and noCourseStudentIds.size()>0">
                 AND sr.user_id_ IN
                 <foreach collection="noCourseStudentIds" item="noCourseStudentId" open="(" close=")" separator=",">
                     #{noCourseStudentId}
                 </foreach>
-            </if>
     </select>
 
     <select id="getStudentNames" resultType="string">
@@ -673,7 +658,7 @@
         FROM
             sys_user su
         WHERE
-            1=1
+            su.tenant_id_ = #{tenantId}
             AND su.del_flag_=0 AND su.lock_flag_=0
             AND FIND_IN_SET('STUDENT',su.user_type_)
             <if test="organIds!=null">
@@ -695,7 +680,7 @@
         FROM
             sys_user su
         WHERE
-            1=1
+            su.tenant_id_ = #{tenantId}
             AND su.del_flag_=0 AND su.lock_flag_=0
             AND FIND_IN_SET('STUDENT',su.user_type_)
             <if test="organIds!=null">
@@ -790,7 +775,7 @@
 
     <select id="queryPushMemberRenew" resultType="java.lang.Integer">
         SELECT s.user_id_ FROM student s
-        LEFT JOIN cloud_teacher_order cto ON cto.student_id_ = s.user_id_ AND cto.status_ IN (1,2)
+        LEFT JOIN cloud_teacher_order cto ON cto.student_id_ = s.user_id_ AND cto.status_ IN (1,2) where s.tenant_id_ = #{tenantId}
         GROUP BY s.user_id_ HAVING (MAX(cto.id_) IS NULL OR MIN(cto.status_) > 1)
         AND DATEDIFF(MAX(cto.end_time_),NOW()) = #{pushMemberRenew}
     </select>
@@ -839,12 +824,10 @@
                  AND cs.status_='NOT_START')) t
         LEFT JOIN sys_user su ON t.user_id_=su.id_
         WHERE su.del_flag_=0
-        <if test="organIds!=null and organIds.size()>0">
             AND su.organ_id_ IN
             <foreach collection="organIds" item="organId" open="(" close=")" separator=",">
                 #{organId}
             </foreach>
-        </if>
     </select>
 
     <select id="getOrgansStudentNum" resultType="map">
@@ -865,12 +848,10 @@
         AND cs.status_='NOT_START')) t
         LEFT JOIN sys_user su ON t.user_id_=su.id_
         WHERE su.del_flag_=0 AND t.user_id_ NOT IN (SELECT user_id_ FROM student WHERE subject_id_list_ REGEXP '21|25|26|27|28|29')
-<!--        <if test="organIds!=null and organIds.size()>0">-->
-<!--            AND su.organ_id_ IN-->
-<!--            <foreach collection="organIds" item="organId" open="(" close=")" separator=",">-->
-<!--                #{organId}-->
-<!--            </foreach>-->
-<!--        </if>-->
+           AND su.organ_id_ IN
+           <foreach collection="organIds" item="organId" open="(" close=")" separator=",">
+               #{organId}
+           </foreach>
         GROUP BY su.organ_id_
     </select>
 
@@ -896,12 +877,10 @@
         <if test="organId!=null">
             AND tea.organ_id_=#{organId}
         </if>
-        <if test="teacherIds!=null and teacherIds.size()>0">
             AND stu.teacher_id_ IN
             <foreach collection="teacherIds" item="teacherId" open="(" close=")" separator=",">
                 #{teacherId}
             </foreach>
-        </if>
         GROUP BY stu.teacher_id_
     </select>
 
@@ -910,9 +889,7 @@
         FROM student stu
         LEFT JOIN sys_user su ON stu.user_id_ = su.id_
         WHERE su.del_flag_=0 AND stu.teacher_id_ IS NULL
-        <if test="organId!=null">
             AND su.organ_id_=#{organId}
-        </if>
     </select>
 
     <select id="getCloudStudyStudentNum" resultType="int">
@@ -931,12 +908,10 @@
                  LEFT JOIN sys_user su ON smcr.user_id_=su.id_
                  LEFT JOIN student stu ON smcr.user_id_=stu.user_id_
         WHERE su.del_flag_=0 AND stu.user_id_ IS NOT NULL
-        <if test="organIds!=null and organIds.size()>0">
             AND su.organ_id_ IN
             <foreach collection="organIds" item="organId" open="(" close=")" separator=",">
                 #{organId}
             </foreach>
-        </if>
     </select>
 
     <select id="getOrgansTodayTotalCloudStudyStudentNum" resultType="int">
@@ -947,12 +922,10 @@
         LEFT JOIN student stu ON smcr.user_id_=stu.user_id_
         WHERE su.del_flag_=0 AND stu.user_id_ IS NOT NULL
         AND DATE(smcr.create_time_) = CURDATE()
-        <if test="organIds!=null and organIds.size()>0">
             AND su.organ_id_ IN
             <foreach collection="organIds" item="organId" open="(" close=")" separator=",">
                 #{organId}
             </foreach>
-        </if>
     </select>
 
     <select id="getOrganCloudStudyStudentNum" resultType="map">
@@ -963,12 +936,10 @@
                  LEFT JOIN sys_user su ON smcr.user_id_=su.id_
                  LEFT JOIN student stu ON smcr.user_id_=stu.user_id_
         WHERE su.del_flag_=0 AND stu.user_id_ IS NOT NULL
-        <if test="organIds!=null and organIds.size()>0">
             AND su.organ_id_ IN
             <foreach collection="organIds" item="organId" open="(" close=")" separator=",">
                 #{organId}
             </foreach>
-        </if>
         GROUP BY su.organ_id_
     </select>
 
@@ -984,12 +955,10 @@
         <if test="organId!=null">
             AND tea.organ_id_=#{organId}
         </if>
-        <if test="teacherIds!=null and teacherIds.size()>0">
             AND stu.teacher_id_ IN
             <foreach collection="teacherIds" item="teacherId" open="(" close=")" separator=",">
                 #{teacherId}
             </foreach>
-        </if>
         GROUP BY stu.teacher_id_
     </select>
 
@@ -1014,12 +983,10 @@
                        LEFT JOIN sys_user su ON smcr.user_id_=su.id_
                        LEFT JOIN student stu ON smcr.user_id_=stu.user_id_
               WHERE su.del_flag_=0 AND stu.user_id_ IS NOT NULL
-                <if test="organIds!=null and organIds.size()>0">
                     AND su.organ_id_ IN
                     <foreach collection="organIds" item="organId" open="(" close=")" separator=",">
                         #{organId}
                     </foreach>
-                </if>
               GROUP BY smcr.user_id_) t WHERE t.days>=5
     </select>
 
@@ -1035,19 +1002,17 @@
                        LEFT JOIN sys_user su ON smcr.user_id_=su.id_
                        LEFT JOIN student stu ON smcr.user_id_=stu.user_id_
               WHERE su.del_flag_=0 AND stu.user_id_ IS NOT NULL
-                <if test="organIds!=null and organIds.size()>0">
                     AND su.organ_id_ IN
                     <foreach collection="organIds" item="organId" open="(" close=")" separator=",">
                         #{organId}
                     </foreach>
-                </if>
               GROUP BY smcr.user_id_) t WHERE t.days>=5
         GROUP BY t.organ_id_
     </select>
 
     <sql id="queryCloudStudyStudentDataCondition">
         <where>
-            su.del_flag_=0 AND t.user_id_ NOT IN (SELECT user_id_ FROM student WHERE subject_id_list_ REGEXP '21|25|26|27|28|29')
+            su.del_flag_=0 AND t.user_id_ NOT IN (SELECT user_id_ FROM student WHERE subject_id_list_ REGEXP '21|25|26|27|28|29') and su.tenant_id_ = #{tenantId}
             <if test="organId!=null">
                 AND su.organ_id_=#{organId}
             </if>
@@ -1153,30 +1118,10 @@
                  LEFT JOIN cloud_teacher_order cto ON stu.user_id_=cto.student_id_
                  LEFT JOIN sys_user su ON su.id_=stu.user_id_
         WHERE su.del_flag_=0 AND stu.experience_member_rank_setting_id_ IS NOT NULL AND (cto.id_ IS NULL OR cto.status_ NOT IN (1, 2))
-        <if test="organIds!=null and organIds.size()>0">
             AND su.organ_id_ IN
             <foreach collection="organIds" item="organId" open="(" close=")" separator=",">
                 #{organId}
             </foreach>
-        </if>
-    </select>
-
-    <select id="getOrgansEVipStudentNum" resultType="map">
-        SELECT
-            su.organ_id_ 'key',
-            COUNT(DISTINCT stu.user_id_) 'value'
-        FROM student stu
-                 LEFT JOIN cloud_teacher_order cto ON stu.user_id_=cto.student_id_
-                 LEFT JOIN sys_user su ON su.id_=stu.user_id_
-        WHERE su.del_flag_=0 AND stu.experience_member_rank_setting_id_ IS NOT NULL
-        AND stu.user_id_ NOT IN (SELECT DISTINCT student_id_ FROM cloud_teacher_order WHERE status_ IN (1,2))
-        <if test="organIds!=null and organIds.size()>0">
-            AND su.organ_id_ IN
-            <foreach collection="organIds" item="organId" open="(" close=")" separator=",">
-                #{organId}
-            </foreach>
-        </if>
-        GROUP BY su.organ_id_
     </select>
 
     <select id="getTeacherExperienceMemberStudentNum" resultType="map">
@@ -1190,12 +1135,10 @@
         <if test="organId!=null">
             AND su.organ_id_=#{organId}
         </if>
-        <if test="teacherIds!=null and teacherIds.size()>0">
             AND stu.teacher_id_ IN
             <foreach collection="teacherIds" item="teacherId" open="(" close=")" separator=",">
                 #{teacherId}
             </foreach>
-        </if>
         GROUP BY stu.teacher_id_
     </select>
 
@@ -1215,12 +1158,10 @@
                COUNT(DISTINCT su.id_) percent_
         FROM sys_user su
         WHERE 1 = 1
-        <if test="userIds!=null and userIds.size() > 0">
             AND su.id_ IN
             <foreach collection="userIds" item="userId" open="(" close=")" separator=",">
                 #{userId}
             </foreach>
-        </if>
         <if test="organIds!=null and organIds.size() > 0">
             AND su.organ_id_ IN
             <foreach collection="organIds" item="organId" open="(" close=")" separator=",">
@@ -1283,12 +1224,10 @@
         FROM student stu
         LEFT JOIN cooperation_organ co ON stu.cooperation_organ_id_=co.id_
         WHERE 1=1
-        <if test="studentIds!=null and studentIds.size()>0">
             AND stu.user_id_ IN
             <foreach collection="studentIds" item="studentId" open="(" close=")" separator=",">
                 #{studentId}
             </foreach>
-        </if>
     </select>
 
     <update id="updateGrade"><![CDATA[
@@ -1392,6 +1331,7 @@
         LEFT JOIN organization o ON o.id_ = su.organ_id_
         LEFT JOIN subject sb ON sb.id_ = s.subject_id_list_
         <where>
+        	su.tenant_id_ = #{tenantid}
             <if test="studentIds != null and studentIds.size > 0">
                 AND s.user_id_ IN
                 <foreach collection="studentIds" separator="," item="studentId" open="(" close=")">
@@ -1415,6 +1355,7 @@
         SELECT count(s.user_id_) FROM student s
         LEFT JOIN sys_user su ON su.id_ = s.user_id_
         <where>
+        	su.tenant_id_ = #{tenantid}
             <if test="studentIds != null and studentIds.size > 0">
                 AND s.user_id_ IN
                 <foreach collection="studentIds" separator="," item="studentId" open="(" close=")">

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

@@ -17,6 +17,7 @@
         <result column="update_time_" property="updateTime"/>
         <result column="del_flag_" property="delFlag"/>
         <result column="surplus_course_num" property="surplusCourseNum"/>
+        <result column="tenant_id_" property="tenantId"/>
     </resultMap>
 
     <!-- 根据主键查询一条记录 -->
@@ -26,15 +27,15 @@
 
     <!-- 全查询 -->
     <select id="findAll" resultMap="StudentPauseInfo">
-		SELECT * FROM student_pause_info WHERE del_flag_ = 0 ORDER BY id_
+		SELECT * FROM student_pause_info WHERE del_flag_ = 0 where tenant_id_ = #{tenantId} ORDER BY id_
 	</select>
 
     <!-- 向数据库增加一条记录 -->
     <insert id="insert" parameterType="com.ym.mec.biz.dal.entity.StudentPauseInfo" useGeneratedKeys="true"
             keyColumn="id"
             keyProperty="id">
-        INSERT INTO student_pause_info (group_type_,music_group_id_,class_group_id_,user_id_,courses_json_,create_time_,update_time_,surplus_course_num)
-        VALUES(#{groupType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{musicGroupId},#{classGroupId},#{userId},#{coursesJson},now(),now(),#{surplusCourseNum})
+        INSERT INTO student_pause_info (group_type_,music_group_id_,class_group_id_,user_id_,courses_json_,create_time_,update_time_,surplus_course_num,tenant_id_)
+        VALUES(#{groupType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{musicGroupId},#{classGroupId},#{userId},#{coursesJson},now(),now(),#{surplusCourseNum},#{tenantId})
     </insert>
 
     <!-- 根据主键查询一条记录 -->
@@ -64,7 +65,7 @@
             </if>
             update_time_ = NOW()
         </set>
-        WHERE id_ = #{id}
+        WHERE id_ = #{id} and tenant_id_ = #{tenantId}
     </update>
 
     <!-- 根据主键删除一条记录 -->
@@ -81,13 +82,13 @@
 
     <!-- 分页查询 -->
     <select id="queryPage" resultMap="StudentPauseInfo" parameterType="map">
-        SELECT * FROM student_pause_info
+        SELECT * FROM student_pause_info where tenant_id_ = #{tenantId}
         <include refid="global.limit"/>
     </select>
 
     <!-- 查询当前表的总记录数 -->
     <select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM student_pause_info
+		SELECT COUNT(*) FROM student_pause_info where tenant_id_ = #{tenantId}
 	</select>
     <select id="findByGroupAndUser" resultMap="StudentPauseInfo">
         SELECT * FROM student_pause_info

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

@@ -13,6 +13,7 @@
         <result column="price_" property="price"/>
         <result column="create_time_" property="createTime"/>
         <result column="update_time_" property="updateTime"/>
+        <result column="tenant_id_" property="tenantId"/>
         <result column="payment_order_id_" property="paymentOrderId"/>
         <result column="kit_group_purchase_type_" property="kitGroupPurchaseType"
                 typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
@@ -51,7 +52,7 @@
     <!-- 全查询 -->
     <select id="findAll" resultMap="StudentPaymentOrderDetail">
         SELECT *
-        FROM student_payment_order_detail
+        FROM student_payment_order_detail where tenant_id_ = #{tenantId}
         ORDER BY id_
     </select>
 
@@ -64,9 +65,9 @@
         </selectKey>
         -->
         INSERT INTO student_payment_order_detail
-        (id_,type_,goods_id_list_,price_,create_time_,update_time_,payment_order_id_,kit_group_purchase_type_,student_instrument_id_,is_renew_)
+        (id_,type_,goods_id_list_,price_,create_time_,update_time_,payment_order_id_,kit_group_purchase_type_,student_instrument_id_,is_renew_,tenant_id_)
         VALUES(#{id},#{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{goodsIdList},#{price},now(),now(),
-        #{paymentOrderId},#{kitGroupPurchaseType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{studentInstrumentId},#{isRenew})
+        #{paymentOrderId},#{kitGroupPurchaseType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{studentInstrumentId},#{isRenew},#{tenantId})
     </insert>
 
     <!-- 根据主键查询一条记录 -->
@@ -96,7 +97,7 @@
                 student_instrument_id_ = #{studentInstrumentId},
             </if>
         </set>
-        WHERE id_ = #{id}
+        WHERE id_ = #{id} and tenant_id_ = #{tenantId}
     </update>
 
     <!-- 根据主键删除一条记录 -->
@@ -108,24 +109,24 @@
 
     <!-- 分页查询 -->
     <select id="queryPage" resultMap="StudentPaymentOrderDetail" parameterType="map">
-        SELECT * FROM student_payment_order_detail ORDER BY id_
+        SELECT * FROM student_payment_order_detail where tenant_id_ = #{tenantId} ORDER BY id_
         <include refid="global.limit"/>
     </select>
 
     <!-- 查询当前表的总记录数 -->
     <select id="queryCount" resultType="int">
         SELECT COUNT(*)
-        FROM student_payment_order_detail
+        FROM student_payment_order_detail where tenant_id_ = #{tenantId}
     </select>
 
     <insert id="batchAdd" parameterType="java.util.List" useGeneratedKeys="true" keyProperty="id_">
         INSERT INTO student_payment_order_detail
-        (id_,type_,goods_id_list_,price_,remit_fee_,create_time_,update_time_,payment_order_id_,kit_group_purchase_type_,student_instrument_id_,is_renew_)
+        (id_,type_,goods_id_list_,price_,remit_fee_,create_time_,update_time_,payment_order_id_,kit_group_purchase_type_,student_instrument_id_,is_renew_,tenant_id_)
         VALUE
         <foreach collection="studentPaymentOrderDetailList" item="orderDetail" separator=",">
             (#{orderDetail.id},#{orderDetail.type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
             #{orderDetail.goodsIdList},#{orderDetail.price},#{orderDetail.remitFee},now(),now(),#{orderDetail.paymentOrderId},
-            #{orderDetail.kitGroupPurchaseType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{orderDetail.studentInstrumentId},#{orderDetail.isRenew})
+            #{orderDetail.kitGroupPurchaseType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{orderDetail.studentInstrumentId},#{orderDetail.isRenew},#{orderDetail.tenantId})
         </foreach>
     </insert>
 

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

@@ -39,6 +39,7 @@
         <result column="coupon_remit_fee_" property="couponRemitFee"/>
         <result column="activity_id_" property="activityId"/>
         <result column="activity_buy_num_" property="activityBuyNum"/>
+        <result column="tenant_id_" property="tenantId"/>
     </resultMap>
 
     <resultMap type="com.ym.mec.biz.dal.dto.StudentPaymentOrderDto" extends="StudentPaymentOrder"
@@ -95,7 +96,7 @@
     <!-- 全查询 -->
     <select id="findAll" resultMap="StudentPaymentOrder">
         SELECT *
-        FROM student_payment_order
+        FROM student_payment_order where tenant_id_ = #{tenantId}
         ORDER BY id_
     </select>
 
@@ -108,7 +109,7 @@
          balance_payment_amount_, remit_fee_, course_remit_fee_, trans_no_,
          status_, memo_, create_time_, update_time_, payment_channel_, payment_business_channel_,
          payment_account_no_, mer_nos_, order_no_, music_group_id_, class_group_id_, pay_time_,batch_no_,coupon_code_id_,
-         coupon_remit_fee_,activity_id_,activity_buy_num_)
+         coupon_remit_fee_,activity_id_,activity_buy_num_,tenant_id_)
         VALUES (#{groupType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
                 #{userId}, #{organId}, #{routingOrganId},
                 #{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
@@ -117,7 +118,7 @@
                 #{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}, #{memo}, now(), now(),
                 #{paymentChannel}, #{paymentBusinessChannel}, #{paymentAccountNo}, #{merNos}, #{orderNo},
                 #{musicGroupId},
-                #{classGroupId}, #{payTime},#{batchNo},#{couponCodeId},#{couponRemitFee},#{activityId},#{activityBuyNum})
+                #{classGroupId}, #{payTime},#{batchNo},#{couponCodeId},#{couponRemitFee},#{activityId},#{activityBuyNum},#{tenantId})
     </insert>
 
 
@@ -211,7 +212,7 @@
             </if>
             update_time_ = NOW()
         </set>
-        WHERE id_ = #{id} AND version_ = #{version}
+        WHERE id_ = #{id} AND version_ = #{version} and tenant_id_ = #{tenantId}
     </update>
     
     <update id="batchUpdate" parameterType="com.ym.mec.biz.dal.entity.StudentPaymentOrder">
@@ -304,7 +305,7 @@
 	            </if>
 	            update_time_ = NOW()
 	        </set>
-	        WHERE id_ = #{studentPaymentOrder.id} AND version_ = #{studentPaymentOrder.version}
+	        WHERE id_ = #{studentPaymentOrder.id} AND version_ = #{studentPaymentOrder.version} and tenant_id_ = #{studentPaymentOrder.tenantId}
 		</foreach>
     </update>
 
@@ -334,6 +335,7 @@
 
     <sql id="queryPaymentOrder">
         <where>
+        	spo.tenant_id_ = #{tenantId}
             <if test="userIds != null">
                 AND spo.user_id_ IN
                 <foreach collection="userIds" item="userId" open="(" close=")" separator=",">
@@ -489,15 +491,6 @@
           AND status_ = #{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
     </select>
 
-    <!-- 查找支付成功和支付中订单 -->
-    <select id="findPayOrderNum" resultType="int">
-        <![CDATA[
-        SELECT COUNT(*)
-        FROM student_payment_order
-        WHERE FIND_IN_SET(status_, 'SUCCESS,ING')
-        ]]>
-    </select>
-
     <resultMap type="com.ym.mec.biz.dal.dto.UserGoodsDto" id="userGoodsDto">
         <result column="goods_id_" property="goodsId"/>
         <collection property="goodsName" ofType="string">
@@ -606,17 +599,6 @@
         </foreach>
     </select>
 
-    <select id="findFixOrder" resultMap="StudentPaymentOrder">
-        SELECT *
-        FROM student_payment_order
-        where status_ = 'SUCCESS'
-          AND type_ = 'APPLY'
-          AND actual_amount_ > 0
-          and mer_nos_ IS NULL
-        LIMIT 100
-    </select>
-
-
     <resultMap type="com.ym.mec.biz.dal.dto.StudentPaymentOrderExportDto" id="orderAndDetail"
                extends="StudentPaymentOrder">
         <result column="organ_name" property="organName"/>
@@ -684,7 +666,7 @@
         LEFT JOIN sys_user su ON spo.user_id_ = su.id_
         LEFT JOIN organization o ON o.id_ = spo.organ_id_
         LEFT JOIN sporadic_charge_info sci ON sci.id_ = spo.music_group_id_
-        WHERE spo.type_ = 'SPORADIC'
+        WHERE spo.type_ = 'SPORADIC' and spo.tenant_id_ = #{tenantId}
         <include refid="sporadicQueryPageSql"/>
         ORDER BY spo.id_ DESC
         <include refid="global.limit"/>
@@ -694,7 +676,7 @@
         FROM student_payment_order spo
         LEFT JOIN sys_user su ON spo.user_id_ = su.id_
         LEFT JOIN sporadic_charge_info sci ON sci.id_ = spo.music_group_id_
-        WHERE spo.type_ = 'SPORADIC'
+        WHERE spo.type_ = 'SPORADIC' and spo.tenant_id_ = #{tenantId}
         <include refid="sporadicQueryPageSql"/>
     </select>
     <sql id="sporadicQueryPageSql">
@@ -726,7 +708,7 @@
         FROM student_payment_order spo
                  LEFT JOIN organization o ON o.id_ = spo.organ_id_
         WHERE spo.type_ = 'LUCK'
-          AND spo.status_ = 'SUCCESS'
+          AND spo.status_ = 'SUCCESS' and spo.tenant_id_ = #{tenantId}
         GROUP BY spo.organ_id_
         ORDER BY nums DESC;
     </select>
@@ -735,9 +717,7 @@
         select count(*) total,sum(actual_amount_) total_num_ from student_payment_order
         where actual_amount_ &gt; 0 and DATE_FORMAT(create_time_, '%Y%m' ) = DATE_FORMAT( CURDATE() , '%Y%m' ) AND
         status_ = 'SUCCESS' and organ_id_ not in (36,38)
-        <if test="organId != null">
             and FIND_IN_SET(organ_id_,#{organId})
-        </if>
     </select>
     <select id="countUserBuyVipGroupSuccessOrder" resultType="int">
         select count(*)
@@ -844,9 +824,7 @@
         LEFT JOIN sys_user su on spo.user_id_ = su.id_
         LEFT JOIN organization o ON o.id_ = spo.id_
         WHERE spo.status_ = 'SUCCESS'
-        <if test="organIds != null">
             AND FIND_IN_SET (spo.organ_id_,#{organIds})
-        </if>
         <if test="orderTypeList != null">
             AND spo.type_ IN
             <foreach collection="orderTypeList" item="orderType" open="(" close=")"

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

@@ -27,6 +27,7 @@
         <result column="create_by_" property="createBy"/>
         <result column="update_time_" property="updateTime"/>
         <result column="update_by_" property="updateBy"/>
+        <result column="tenant_id_" property="tenantId"/>
     </resultMap>
 
     <resultMap id="StudentPaymentRouteOrderDto" type="com.ym.mec.biz.dal.dto.StudentPaymentRouteOrderDto"
@@ -52,7 +53,7 @@
 
     <sql id="Base_Column_List">
         <!--@mbg.generated-->
-        id_, route_organ_id_, route_amount_,route_balance_amount_, mer_no_, order_no_, fee_flag_,user_id_,school_id_,trans_no_,pay_time_,sale_amount_,service_amount_,service_fee_,memo_,goods_json_,audit_status_,audit_comment_,calender_id_,create_time_,create_by_,update_time_,update_by_
+        id_, route_organ_id_, route_amount_,route_balance_amount_, mer_no_, order_no_, fee_flag_,user_id_,school_id_,trans_no_,pay_time_,sale_amount_,service_amount_,service_fee_,memo_,goods_json_,audit_status_,audit_comment_,calender_id_,create_time_,create_by_,update_time_,update_by_,tenant_id_
     </sql>
     <select id="get" parameterType="java.lang.Long" resultMap="StudentPaymentRouteOrderMap">
         <!--@mbg.generated-->
@@ -72,8 +73,8 @@
             parameterType="com.ym.mec.biz.dal.entity.StudentPaymentRouteOrder" useGeneratedKeys="true">
         <!--@mbg.generated-->
         insert into student_payment_route_order (route_organ_id_, route_amount_,route_balance_amount_, mer_no_,
-        order_no_, fee_flag_,user_id_,school_id_,trans_no_,pay_time_,sale_amount_,service_amount_,service_fee_,memo_,goods_json_,audit_status_,audit_comment_,calender_id_,create_time_,update_time_,create_by_,update_by_)
-        values (#{routeOrganId}, #{routeAmount},#{routeBalanceAmount}, #{merNo}, #{orderNo}, #{feeFlag},#{userId},#{schoolId},#{transNo},#{payTime},#{saleAmount},#{serviceAmount},#{serviceFee},#{memo},#{goodsJson},#{auditStatus,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{auditComment},#{calenderId},#{createTime},#{updateTime},#{createBy},#{updateBy})
+        order_no_, fee_flag_,user_id_,school_id_,trans_no_,pay_time_,sale_amount_,service_amount_,service_fee_,memo_,goods_json_,audit_status_,audit_comment_,calender_id_,create_time_,update_time_,create_by_,update_by_,tenant_id_)
+        values (#{routeOrganId}, #{routeAmount},#{routeBalanceAmount}, #{merNo}, #{orderNo}, #{feeFlag},#{userId},#{schoolId},#{transNo},#{payTime},#{saleAmount},#{serviceAmount},#{serviceFee},#{memo},#{goodsJson},#{auditStatus,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{auditComment},#{calenderId},#{createTime},#{updateTime},#{createBy},#{updateBy},#{tenantId})
     </insert>
     <update id="update" parameterType="com.ym.mec.biz.dal.entity.StudentPaymentRouteOrder">
         <!--@mbg.generated-->
@@ -141,7 +142,7 @@
                 update_by_ = #{updateBy},
             </if>
         </set>
-        where id_ = #{id}
+        where id_ = #{id} and tenant_id_ = #{tenantId}
     </update>
 
     <insert id="batchAdd" parameterType="java.util.List" useGeneratedKeys="true" keyColumn="id"
@@ -149,7 +150,7 @@
         INSERT INTO student_payment_route_order
         (order_no_,route_organ_id_, route_amount_,route_balance_amount_, mer_no_,fee_flag_,user_id_,
         school_id_,trans_no_,pay_time_,sale_amount_,service_amount_,service_fee_,memo_,goods_json_,audit_status_,
-        audit_comment_,calender_id_,create_time_,update_time_,create_by_,update_by_)
+        audit_comment_,calender_id_,create_time_,update_time_,create_by_,update_by_,tenant_id_)
         VALUE
         <foreach collection="routeOrders" item="routeOrder" separator=",">
             (#{routeOrder.orderNo},#{routeOrder.routeOrganId},#{routeOrder.routeAmount},
@@ -157,7 +158,7 @@
             #{routeOrder.userId},#{routeOrder.schoolId},#{routeOrder.transNo},#{routeOrder.payTime},
             #{routeOrder.saleAmount},#{routeOrder.serviceAmount},#{routeOrder.serviceFee},#{routeOrder.memo},#{routeOrder.goodsJson},
             #{routeOrder.auditStatus,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{routeOrder.auditComment},
-            #{routeOrder.calenderId},NOW(),NOW(),#{routeOrder.createBy},#{routeOrder.updateBy})
+            #{routeOrder.calenderId},NOW(),NOW(),#{routeOrder.createBy},#{routeOrder.updateBy},#{routeOrder.tenantId})
         </foreach>
     </insert>
 
@@ -194,6 +195,7 @@
 
     <sql id="queryPaymentOrder">
         <where>
+        	spo.tenant_id_ = #{tenantId}
             <if test="userIds != null">
                 AND spo.user_id_ IN
                 <foreach collection="userIds" item="userId" open="(" close=")" separator=",">
@@ -322,7 +324,7 @@
          per_amount_,
          balance_payment_amount_, remit_fee_, course_remit_fee_, trans_no_,
          status_, memo_, create_time_, update_time_, payment_channel_, payment_business_channel_,
-         payment_account_no_, mer_nos_, order_no_, music_group_id_, class_group_id_, pay_time_)
+         payment_account_no_, mer_nos_, order_no_, music_group_id_, class_group_id_, pay_time_,tenant_id_)
         VALUES (#{id}, #{groupType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
                 #{userId}, #{organId}, #{routingOrganId},
                 #{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
@@ -331,13 +333,14 @@
                 #{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}, #{memo}, #{createTime}, now(),
                 #{paymentChannel}, #{paymentBusinessChannel}, #{paymentAccountNo}, #{merNos}, #{orderNo},
                 #{musicGroupId},
-                #{classGroupId}, #{payTime})
+                #{classGroupId}, #{payTime},#{tenantId})
     </insert>
 
     <select id="queryAuditCount" parameterType="map" resultType="int">
 		SELECT count(spro.id_) FROM student_payment_route_order spro
         left join sys_user u on spro.user_id_ = u.id_
         <where>
+        	spro.tenant_id_ = #{tenantId}
         	<if test="transNo != null and transNo != ''">
         		and spro.trans_no_ = #{transNo}
         	</if>
@@ -369,6 +372,7 @@
         left join cooperation_organ s on s.id_ = spro.school_id_
         left join organization o on o.id_ = spro.route_organ_id_
         <where>
+        	spro.tenant_id_ = #{tenantId}
         	<if test="transNo != null and transNo != ''">
         		and spro.trans_no_ = #{transNo}
         	</if>

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

@@ -25,6 +25,7 @@
         <result column="cloud_teacher_method_" property="cloudTeacherMethod"/>
         <result column="create_time_" property="createTime"/>
         <result column="is_registered_" property="isRegistered"/>
+        <result column="tenant_id_" property="tenantId"/>
     </resultMap>
 
     <resultMap type="com.ym.mec.biz.dal.dto.StudentPreRegistrationDto" id="StudentPreRegistrationDto"
@@ -53,6 +54,7 @@
         SELECT spr.*
         FROM student_pre_registration spr
         <where>
+        	spr.tenant_id_ = #{tenantId}
             <if test="musicGroupId != null">
                 and spr.music_group_id_ = #{musicGroupId}
             </if>
@@ -88,8 +90,8 @@
         </selectKey>
         -->
         INSERT INTO student_pre_registration
-        (id_,music_group_id_,user_id_,phone_,user_name_,gender_,current_grade_,current_grade_num_,current_class_,subject_first_,subject_second_,teacher_recommand_subject_id_,selection_subject_id_,is_allow_adjust_,kit_purchase_method_,cloud_teacher_method_,create_time_)
-        VALUES(#{id},#{musicGroupId},#{userId},#{phone},#{userName},#{gender},#{currentGrade},#{currentGradeNum},#{currentClass},#{subjectFirst},#{subjectSecond},#{teacherRecommandSubjectId},#{selectionSubjectId},#{isAllowAdjust},#{kitPurchaseMethod},#{cloudTeacherMethod},#{createTime})
+        (id_,music_group_id_,user_id_,phone_,user_name_,gender_,current_grade_,current_grade_num_,current_class_,subject_first_,subject_second_,teacher_recommand_subject_id_,selection_subject_id_,is_allow_adjust_,kit_purchase_method_,cloud_teacher_method_,create_time_,tenant_id_)
+        VALUES(#{id},#{musicGroupId},#{userId},#{phone},#{userName},#{gender},#{currentGrade},#{currentGradeNum},#{currentClass},#{subjectFirst},#{subjectSecond},#{teacherRecommandSubjectId},#{selectionSubjectId},#{isAllowAdjust},#{kitPurchaseMethod},#{cloudTeacherMethod},#{createTime},#{tenantId})
     </insert>
 
     <!-- 根据主键查询一条记录 -->
@@ -148,7 +150,7 @@
                 create_time_ = #{createTime},
             </if>
         </set>
-        WHERE id_ = #{id}
+        WHERE id_ = #{id} and tenant_id_ = #{tenantId}
     </update>
 
     <!-- 根据主键删除一条记录 -->
@@ -168,6 +170,7 @@
         left join subject s4 on s4.id_ = spr.selection_subject_id_
         left join student_registration sr on spr.music_group_id_ = sr.music_group_id_ and spr.user_id_ = sr.user_id_
         <where>
+        	spr.tenant_id_ = #{tenantId}
             <if test="musicGroupId != null">
                 and spr.music_group_id_ = #{musicGroupId}
             </if>
@@ -205,6 +208,7 @@
     <select id="queryCount" resultType="int">
         SELECT COUNT(spr.id_) FROM student_pre_registration spr
         <where>
+        	spr.tenant_id_ = #{tenantId}
             <if test="musicGroupId != null">
                 and spr.music_group_id_ = #{musicGroupId}
             </if>

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

@@ -20,6 +20,7 @@
         <result column="comment_" property="comment"/>
         <result column="create_time_" property="createTime"/>
         <result column="modify_time_" property="modifyTime"/>
+        <result column="tenant_id_" property="tenantId"/>
     </resultMap>
     
     <resultMap type="com.ym.mec.biz.dal.entity.StudentRecharge" id="StudentRechargeVO" extends="StudentRecharge">
@@ -35,7 +36,7 @@
 
     <!-- 全查询 -->
     <select id="findAll" resultMap="StudentRecharge">
-		SELECT * FROM student_recharge ORDER BY id_
+		SELECT * FROM student_recharge where tenant_id_ = #{tenantId} ORDER BY id_
 	</select>
 
     <!-- 向数据库增加一条记录 -->
@@ -47,8 +48,8 @@
         </selectKey>
         -->
         INSERT INTO student_recharge
-        (id_,user_id_,trans_no_,order_no_,status_,amount_,fee_user_,fee_platform_,pay_platform_,description_,comment_,create_time_,modify_time_)
-        VALUES(#{id},#{userId},#{transNo},#{orderNo},#{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{amount},#{feeUser},#{feePlatform},#{payPlatform},#{description},#{comment},now(),now())
+        (id_,user_id_,trans_no_,order_no_,status_,amount_,fee_user_,fee_platform_,pay_platform_,description_,comment_,create_time_,modify_time_,tenant_id_)
+        VALUES(#{id},#{userId},#{transNo},#{orderNo},#{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{amount},#{feeUser},#{feePlatform},#{payPlatform},#{description},#{comment},now(),now(),#{tenantId})
     </insert>
 
     <!-- 根据主键查询一条记录 -->
@@ -89,7 +90,7 @@
                 pay_platform_ = #{payPlatform},
             </if>
         </set>
-        WHERE id_ = #{id}
+        WHERE id_ = #{id} and tenant_id_ = #{tenantId}
     </update>
 
     <!-- 根据主键删除一条记录 -->
@@ -100,6 +101,7 @@
     <!-- 分页查询 -->
     <select id="queryPage" resultMap="StudentRechargeVO" parameterType="map">
         SELECT sr.*,u.username_,cad.trans_no_,cad.trans_type_ FROM student_recharge sr, sys_user u, sys_user_cash_account_detail cad where sr.user_id_ = u.id_ and sr.user_id_ = cad.user_id_
+        and sr.tenant_id_ = #{tenantId}
         <if test="status != null">
            and sr.status_ = #{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
         </if>
@@ -122,6 +124,7 @@
     <!-- 查询当前表的总记录数 -->
     <select id="queryCount" resultType="int" parameterType="map">
 		SELECT COUNT(1) FROM student_recharge sr left join sys_user u on sr.user_id_ = u.id_ left join sys_user_cash_account_detail cad on sr.user_id_ = cad.user_id_ where 1 = 1
+		and sr.tenant_id_ = #{tenantId}
 		<if test="status != null">
            and sr.status_ = #{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
         </if>

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

@@ -7,6 +7,7 @@
 <mapper namespace="com.ym.mec.biz.dal.dao.StudentRegistrationDao">
     <resultMap type="com.ym.mec.biz.dal.entity.StudentRegistration" id="StudentRegistration">
         <result column="id_" property="id"/>
+        <result column="tenant_id_" property="tenantId"/>
         <result column="user_id_" property="userId"/>
         <result column="name_" property="name"/>
         <result column="id_card_no_" property="idCardNo"/>
@@ -133,7 +134,7 @@
     <!-- 全查询 -->
     <select id="findAll" resultMap="StudentRegistration">
         SELECT *
-        FROM student_registration
+        FROM student_registration where tenant_id_ = #{tenantId}
         ORDER BY id_
     </select>
 
@@ -212,6 +213,7 @@
             <if test="musicGroupPaymentCalenderId != null">
                 music_group_payment_calender_id_,
             </if>
+            tenant_id_
         </trim>
         VALUES
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -284,6 +286,7 @@
             <if test="musicGroupPaymentCalenderId != null">
                 #{musicGroupPaymentCalenderId},
             </if>
+            #{tenantId}
         </trim>
     </insert>
 
@@ -371,7 +374,7 @@
             </if>
                 music_group_payment_calender_id_ =#{musicGroupPaymentCalenderId}
         </set>
-        WHERE id_ = #{id}
+        WHERE id_ = #{id} and tenant_id_ = #{tenantId}
     </update>
 
     <!-- 根据主键删除一条记录 -->
@@ -381,21 +384,10 @@
         WHERE id_ = #{id}
     </delete>
 
-    <sql id="queryPageSql">
-        <where>
-            <if test="isAllowAdjust != null">
-                AND is_allow_adjust_ = #{isAllowAdjust,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
-            </if>
-            <if test="subjectId != null">
-                AND subject_id_ = #{subjectId}
-            </if>
-        </where>
-    </sql>
-
     <!-- 分页查询 -->
     <select id="queryPage" resultMap="StudentRegistration" parameterType="map">
         SELECT *
-        FROM student_registration
+        FROM student_registration where tenant_id_ = #{tenantId}
         ORDER BY id_
         <include refid="global.limit"/>
     </select>
@@ -403,13 +395,13 @@
     <!-- 查询当前表的总记录数 -->
     <select id="queryCount" resultType="int">
         SELECT COUNT(*)
-        FROM student_registration
+        FROM student_registration where tenant_id_ = #{tenantId}
     </select>
 
 
     <sql id="queryStudentDetailPageSql">
         <where>
-            sr.music_group_status_ != 'QUIT'
+            sr.music_group_status_ != 'QUIT' and sr.tenant_id_ = #{tenantId}
             <if test="musicGroupId != null">
                 AND sr.music_group_id_ = #{musicGroupId}
             </if>
@@ -740,7 +732,7 @@
         INSERT INTO student_registration
         (parents_phone_, id_, user_id_, name_, music_group_id_, current_grade_, current_class_, subject_id_,
         is_allow_adjust_, kit_purchase_method_, remark_, create_time_, update_time_,
-        parents_name_, parents_company_, payment_status_, actual_subject_id_, music_group_status_, is_merge_,music_group_payment_calender_id_)
+        parents_name_, parents_company_, payment_status_, actual_subject_id_, music_group_status_, is_merge_,music_group_payment_calender_id_,tenant_id_)
         VALUES
         <foreach collection="list" item="item" index="index" separator=",">
             (#{item.parentsPhone}, #{item.id}, #{item.userId}, #{item.name}, #{item.musicGroupId}, #{item.currentGrade},
@@ -749,7 +741,7 @@
             #{item.kitPurchaseMethod,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
             #{item.remark}, now(), now(), #{item.parentsName}, #{item.parentsCompany},
             #{item.paymentStatus,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}, #{item.subjectId},
-            #{item.musicGroupStatus,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}, #{item.isMerge},#{item.musicGroupPaymentCalenderId})
+            #{item.musicGroupStatus,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}, #{item.isMerge},#{item.musicGroupPaymentCalenderId},#{item.tenantId})
         </foreach>
     </insert>
 
@@ -758,12 +750,12 @@
         INSERT INTO student_registration
         (parents_phone_, user_id_, name_, music_group_id_, current_grade_, current_class_, subject_id_,
         create_time_, update_time_, parents_name_, payment_status_, actual_subject_id_, music_group_status_,
-        temporary_course_fee_, class_group_id_,current_grade_num_,current_grade_date_,music_group_payment_calender_id_)
+        temporary_course_fee_, class_group_id_,current_grade_num_,current_grade_date_,music_group_payment_calender_id_,tenant_id_)
         VALUES (#{parentsPhone}, #{userId}, #{name}, #{musicGroupId}, #{currentGrade}, #{currentClass}, #{subjectId},
         now(), now(), #{parentsName}, #{paymentStatus,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
         #{subjectId},
         #{musicGroupStatus,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}, #{temporaryCourseFee},
-        #{classGroupId},#{currentGradeNum},#{currentGradeDate},#{musicGroupPaymentCalenderId})
+        #{classGroupId},#{currentGradeNum},#{currentGradeDate},#{musicGroupPaymentCalenderId},#{tenantId})
     </insert>
 
     <!-- 查询乐团userIdList的学生 -->
@@ -828,9 +820,7 @@
         FROM student_registration sr
         left join music_group mg on sr.music_group_id_ = mg.id_
         where mg.organ_id_ not in (36, 38)
-        <if test="organId != null">
             AND FIND_IN_SET(mg.organ_id_, #{organId})
-        </if>
     </select>
     <select id="findMapByMusicGroupId" resultType="java.util.Map">
         SELECT sr.user_id_ 'key', MIN(sr.parents_phone_) 'value'
@@ -1087,7 +1077,7 @@
         SELECT mg.organ_id_ organId, COUNT(DISTINCT sr.user_id_) estimatedNums
         FROM student_registration sr
                      LEFT JOIN music_group mg ON sr.music_group_id_ = mg.id_
-        WHERE sr.music_group_status_ = 'NORMAL'
+        WHERE sr.music_group_status_ = 'NORMAL' and sr.tenant_id_ = #{tenantId}
         GROUP BY mg.organ_id_
     </select>
 
@@ -1239,7 +1229,7 @@
 
     <sql id="queryNoClassMusicStudentsCondition">
         <where>
-            sr.music_group_status_ = 'NORMAL'
+            sr.music_group_status_ = 'NORMAL' and sr.tenant_id_ = #{tenantId}
             AND mg.status_ = 'PROGRESS'
             AND cgsm.id_ IS NULL
             <if test="organIds != null and organIds.size() > 0">
@@ -1320,12 +1310,10 @@
         AND cg.type_ = 'NORMAL'
         AND cg.del_flag_ = 0
         AND cg.lock_flag_ = 0
-        <if test="studentIds != null and studentIds.size() > 0">
             AND sr.user_id_ IN
             <foreach collection="studentIds" item="studentId" open="(" close=")" separator=",">
                 #{studentId}
             </foreach>
-        </if>
     </select>
 
     <select id="getPaymentStudentNum" resultType="int">
@@ -1576,9 +1564,7 @@
         <if test="educationUserId != null">
             AND mg.educational_teacher_id_ = #{educationUserId}
         </if>
-        <if test="organIds != null and organIds != ''">
             AND FIND_IN_SET(mg.organ_id_,#{organIds})
-        </if>
         <if test="memberEndAutoQuitMusic != null">
             AND cto.id_ IS NULL AND DATEDIFF(sr.membership_end_time_,NOW()) &lt;= #{memberEndAutoQuitMusic} AND sr.membership_end_time_ > NOW()
         </if>
@@ -1596,12 +1582,10 @@
         <if test="educationUserId != null">
             AND mg.educational_teacher_id_ = #{educationUserId}
         </if>
-        <if test="organIds != null and organIds.size > 0">
             AND mg.organ_id_ IN
             <foreach collection="organIds" open="(" close=")" item="item" separator=",">
                 #{item}
             </foreach>
-        </if>
         <if test="memberEndAutoQuitMusic != null">
             AND cto.id_ IS NULL AND DATEDIFF(sr.membership_end_time_,NOW()) &lt;= #{memberEndAutoQuitMusic} AND sr.membership_end_time_ > NOW()
         </if>
@@ -1629,7 +1613,7 @@
 		from student_registration sr LEFT JOIN sys_user u on sr.user_id_ = u.id_ 
 		LEFT JOIN student s on s.user_id_ = sr.user_id_ LEFT JOIN `subject` sub on sub.id_ = sr.actual_subject_id_
 		LEFT JOIN (select * from student_instrument where id_ in ((select max(id_) from student_instrument group by student_id_))) si on si.student_id_ = sr.user_id_
-		WHERE sr.music_group_status_ = 'NORMAL' 
+		WHERE sr.music_group_status_ = 'NORMAL' and sr.tenant_id_ = #{tenantId}
 		<if test="musicGroupId != null">
 			AND sr.music_group_id_ = #{musicGroupId}
 		</if>
@@ -1657,7 +1641,7 @@
 		from student_registration sr LEFT JOIN sys_user u on sr.user_id_ = u.id_ 
 		LEFT JOIN student s on s.user_id_ = sr.user_id_ LEFT JOIN `subject` sub on sub.id_ = sr.actual_subject_id_
 		LEFT JOIN (select * from student_instrument where id_ in ((select max(id_) from student_instrument group by student_id_))) si on si.student_id_ = sr.user_id_
-		WHERE sr.music_group_status_ = 'NORMAL' 
+		WHERE sr.music_group_status_ = 'NORMAL' and sr.tenant_id_ = #{tenantId}
 		<if test="musicGroupId != null">
 			AND sr.music_group_id_ = #{musicGroupId}
 		</if>
@@ -1694,7 +1678,7 @@
     </select>
     <select id="queryAutoCreateStudentMap" resultType="java.util.Map">
         SELECT GROUP_CONCAT(sr.user_id_) 'value',sr.music_group_id_ 'key' FROM student_registration sr
-        WHERE sr.membership_end_time_ IS NOT NULL AND DATEDIFF(sr.membership_end_time_,NOW()) + 1 = #{pushMemberRenew}
+        WHERE sr.membership_end_time_ IS NOT NULL AND DATEDIFF(sr.membership_end_time_,NOW()) + 1 = #{pushMemberRenew} and sr.tenant_id_ = #{tenantId}
         GROUP BY sr.music_group_id_
     </select>
 
@@ -1703,12 +1687,10 @@
         FROM student_registration sr
         LEFT JOIN music_group mg ON sr.music_group_id_=mg.id_
         WHERE mg.status_='PROGRESS' AND sr.music_group_status_ != 'QUIT'
-        <if test="studentIds!=null and studentIds.size()>0">
             AND sr.user_id_ IN
             <foreach collection="studentIds" item="studentId" open="(" close=")" separator=",">
                 #{studentId}
             </foreach>
-        </if>
         GROUP BY sr.user_id_
     </select>
 
@@ -1718,12 +1700,10 @@
         LEFT JOIN music_group mg ON sr.music_group_id_=mg.id_
         LEFT JOIN sys_user su ON mg.educational_teacher_id_ = su.id_
         WHERE mg.status_='PROGRESS' AND sr.music_group_status_ != 'QUIT'  AND mg.educational_teacher_id_ IS NOT NULL
-        <if test="studentIds!=null and studentIds.size()>0">
             AND sr.user_id_ IN
             <foreach collection="studentIds" item="studentId" open="(" close=")" separator=",">
                 #{studentId}
             </foreach>
-        </if>
         GROUP BY sr.user_id_
     </select>
 
@@ -1733,12 +1713,10 @@
         LEFT JOIN music_group mg ON sr.music_group_id_=mg.id_
         LEFT JOIN school sch ON mg.school_id_=sch.id_
         WHERE mg.status_='PROGRESS'
-        <if test="studentIds!=null and studentIds.size()>0">
             AND sr.user_id_ IN
             <foreach collection="studentIds" item="studentId" open="(" close=")" separator=",">
                 #{studentId}
             </foreach>
-        </if>
         GROUP BY sr.user_id_
     </select>
     <select id="findStudentIds" resultType="java.lang.Integer">
@@ -1748,62 +1726,15 @@
           AND sr.user_id_ NOT IN (SELECT DISTINCT(cssp.`user_id_`)  FROM `course_schedule_student_payment` cssp
                                                  LEFT JOIN course_schedule cs on cssp.`course_schedule_id_` = cs.`id_`
                                                  LEFT JOIN `music_group` mg on mg.`id_` = cssp.`music_group_id_`
-      WHERE cs.`group_type_` = 'MUSIC' AND cs.`status_` = 'OVER' AND mg.`status_` = 'PROGRESS'
+      WHERE cs.`group_type_` = 'MUSIC' AND cs.`status_` = 'OVER' AND mg.`status_` = 'PROGRESS' and sr.tenant_id_ = #{tenantId}
       GROUP BY cssp.`user_id_` HAVING COUNT(cs.`id_`) > 4) AND sr.user_id_ NOT IN (SELECT user_id_ FROM student WHERE subject_id_list_ REGEXP '21|25|26|27|28|29')
     </select>
-    <select id="queryHasMemberGroupStudent" resultType="java.lang.Integer">
-        SELECT DISTINCT sr.user_id_ FROM student_registration sr
-        LEFT JOIN music_group mg ON mg.id_ = sr.music_group_id_
-        WHERE sr.music_group_status_ != 'QUIT' AND mg.status_ NOT IN ('CANCELED','CLOSE') AND mg.course_view_type_ = 2
-    </select>
     <resultMap id="CloudTeacherActiveTargetJsonDto" type="com.ym.mec.biz.dal.dto.CloudTeacherActiveTargetJsonDto">
         <result property="targetNum" column="target_num_"/>
         <result property="targetAmount" column="target_amount_"/>
         <result property="organId" column="organ_id_"/>
     </resultMap>
-    <select id="queryOrganTarget" resultMap="CloudTeacherActiveTargetJsonDto">
-        SELECT su.organ_id_,COUNT(DISTINCT su.id_) target_num_,COUNT(DISTINCT su.id_) * 2040 target_amount_ FROM student_registration sr
-        LEFT JOIN sys_user su  ON sr.user_id_ = su.id_
-        LEFT JOIN music_group mg ON mg.id_ = sr.music_group_id_
-        -- 新用户
-        WHERE su.id_ NOT IN (SELECT DISTINCT(sr.`user_id_`) FROM student_registration sr
-        LEFT JOIN music_group mg ON mg.id_ = sr.music_group_id_
-        LEFT JOIN course_schedule cs on cs.`music_group_id_` = mg.`id_` AND cs.`group_type_` = 'MUSIC' AND cs.`status_` = 'OVER' AND cs.del_flag_ = 0
-        LEFT JOIN `course_schedule_student_payment` cssp on cssp.`course_schedule_id_` = cs.`id_` AND sr.user_id_ = cssp.user_id_
-        WHERE mg.`status_` = 'PROGRESS' AND sr.music_group_status_ = 'NORMAL'
-        GROUP BY sr.`user_id_` HAVING COUNT(cssp.`id_`) &lt;= 4)
-        -- 			非管乐
-        AND su.id_ NOT IN (SELECT user_id_ FROM student WHERE subject_id_list_ REGEXP '21|25|26|27|28|29')
-        -- 			声部排除
-        AND su.organ_id_ NOT IN (36,38,39,41,42,43,44,45,46,47,48,49,50,52,54,55,56,63,2,27,22,24)
-        -- 			购买了云教练
-        AND su.id_ NOT IN (SELECT DISTINCT student_id_ FROM cloud_teacher_order WHERE active_remark_ IS NULL AND status_ != 0)
-        -- 			未退团，不是会员团
-        AND su.id_ NOT IN (SELECT DISTINCT sr.user_id_ FROM student_registration sr
-        LEFT JOIN music_group mg ON mg.id_ = sr.music_group_id_
-        WHERE sr.music_group_status_ != 'QUIT' AND mg.course_view_type_ = 2 AND mg.status_ NOT IN ('CANCELED','CLOSE'))
-        -- 去掉部分非目标学员
-        AND mg.id_ NOT IN ('21062318002900001','20792','21082414270900001','21060314253100001')
-        -- 去掉部分非目标学员
-        AND sr.user_id_ NOT IN (2127770,2127771,2127772,2127773,2127774,2127775,2127776,2127777,
-                              2127778,2127779,2127780,2127781,2127782,2127783,2127784,2127785,2127786,2127787,2127788,
-                              2127789,2127790,2127791,2127792,2127793,2127794,2127795,2127796,2127797,2127798,2127799,
-                              2127800,2127801,2127802,2127803,2127804,2127805,2127806,2127807,2127808,2127809,2127810,
-                              2127811,2127812,2127813,2127814,2127815,2127816,2127817,
-                              2122083,2122084,2122085,2122088,2122090,2122092,2122399,2122567,2122577,2122584,2122847,
-                              2122892,2122893,2122894,2122896,2122898,2122899,2122901,2122902,2122903,2122951,2122953,
-                              2122958,2122962,2122964,2122965,2123157,2123169,2123176,2123187,2123190,2123192,2123201,
-                              2123232,2123304,2125139,2125142,2125145,2125147,2125148,2125151,2125152,2125165,2125168,2125197,2125198,
-                              2132340,2132341,2132342,2132343,2132344,2132345,2132347,2132348,2132349,2132350,2132351,2132352,2132353,
-                              2132354,2132355,2132356,2132357,2132362,2132365,2132366,2132368,2132374,2132375,2132377,2132386,2132387,
-                              2132388,2132390,2132391,2132392,2132394,2132395,2132396,2132400,2132401,2132403,2132405,2132407,2132408,
-                              2132411,2132413,2132414,2132415,2132417,2132418,2132419,2132423,2132424,2132425,2132431,2132434,2132435,
-                              2132436,2132437,2132438,2132440,2132441,2132443,2132444,2132445,2132446,2132447,2132448,2132449,2132452,
-                              2132454,2132457,2132459,2132461,2135865)
-
-        AND sr.music_group_status_ = 'NORMAL' AND mg.course_view_type_ != 2 AND mg.`status_` = 'PROGRESS'
-        GROUP BY su.organ_id_
-    </select>
+
     <resultMap id="MusicStudentInstrumentDto" type="com.ym.mec.biz.dal.dto.MusicStudentInstrumentDto">
         <result property="username" column="username_"/>
         <result property="userId" column="user_id_"/>

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

@@ -39,6 +39,7 @@
         <result column="username_" jdbcType="VARCHAR" property="studentName"/>
         <result column="goods_json_" jdbcType="VARCHAR" property="goodsJson"/>
         <result column="coupon_ids_" jdbcType="VARCHAR" property="couponIds"/>
+        <result column="tenant_id_" property="tenantId"/>
     </resultMap>
     <!-- 根据主键查询一条记录 -->
     <select id="get" resultMap="StudentRepair">
@@ -53,7 +54,7 @@
         insert into student_repair (id_,music_group_id_, trans_no_,student_instrument_id_,maintenance_status_,repair_name_,
         repair_img_,exemption_amount_,organ_id_,student_id_, student_name_,student_school_,employee_id_, employee_name_,
         subject_id_,subject_name_, type_, instrument_no_,fee_list_,description_, amount_, finish_time_,send_type_,
-        contact_name_, contact_mobile_,address_,pay_status_, create_time_,update_time_,repair_status_,goods_json_,coupon_ids_)
+        contact_name_, contact_mobile_,address_,pay_status_, create_time_,update_time_,repair_status_,goods_json_,coupon_ids_,tenant_id_)
         values (#{id,jdbcType=INTEGER},#{musicGroupId}, #{transNo,jdbcType=VARCHAR}, #{studentInstrumentId},
         #{maintenanceStatus},#{repairName},#{repairImg},#{exemptionAmount},#{organId,jdbcType=INTEGER},
         #{studentId,jdbcType=INTEGER}, #{studentName,jdbcType=VARCHAR}, #{studentSchool,jdbcType=VARCHAR},
@@ -62,7 +63,7 @@
         #{feeList,jdbcType=VARCHAR},#{description,jdbcType=VARCHAR}, #{amount,jdbcType=DECIMAL},
         #{finishTime,jdbcType=TIMESTAMP},#{sendType,jdbcType=INTEGER}, #{contactName,jdbcType=VARCHAR},
         #{contactMobile,jdbcType=VARCHAR},#{address,jdbcType=VARCHAR}, #{payStatus,jdbcType=INTEGER},
-        #{createTime,jdbcType=TIMESTAMP},#{updateTime,jdbcType=TIMESTAMP},#{repairStatus},#{goodsJson},#{couponIds})
+        #{createTime,jdbcType=TIMESTAMP},#{updateTime,jdbcType=TIMESTAMP},#{repairStatus},#{goodsJson},#{couponIds},#{tenantId})
     </insert>
     <update id="update" parameterType="com.ym.mec.biz.dal.entity.StudentRepair">
         UPDATE student_repair
@@ -143,7 +144,7 @@
                 update_time_ = #{updateTime},
             </if>
         </set>
-        WHERE id_ = #{id}
+        WHERE id_ = #{id} and tenant_id_ = #{tenantId}
     </update>
 
     <select id="getStudents" resultMap="com.ym.mec.biz.dal.dao.MusicGroupDao.BasicUserDto">
@@ -179,6 +180,7 @@
     </select>
     <sql id="queryPageSql">
         <where>
+        	sr.tenant_id_ = #{tenantId}
             <if test="search != null and search != ''">
                 AND (sr.trans_no_ LIKE CONCAT('%',#{search},'%') OR sr.student_id_ = #{search} OR su.username_ LIKE
                 CONCAT('%',#{search},'%'))

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

@@ -19,11 +19,12 @@
         <result column="visit_time_" property="visitTime"/>
         <result column="create_time_" property="createTime"/>
         <result column="object_id_" property="objectId"/>
+        <result column="tenant_id_" property="tenantId"/>
     </resultMap>
     <sql id="Base_Column_List">
         <!--@mbg.generated-->
         id_, music_group_id_, organ_id_, student_id_, teacher_id_, visiter_type_, type_, purpose_, overview_, feedback_,
-        visit_time_, create_time_
+        visit_time_, create_time_,tenant_id_
     </sql>
     <select id="get" parameterType="java.lang.Integer" resultMap="StudentVisit">
         select
@@ -41,11 +42,11 @@
         <!--@mbg.generated-->
         insert into student_visit (music_group_id_, organ_id_, student_id_, teacher_id_, visiter_type_,
         type_, purpose_, overview_,
-        feedback_, visit_time_, create_time_,object_id_)
+        feedback_, visit_time_, create_time_,object_id_,tenant_id_)
         values (#{musicGroupId,jdbcType=VARCHAR}, #{organId,jdbcType=INTEGER}, #{studentId,jdbcType=INTEGER},
         #{teacherId,jdbcType=INTEGER},#{visiterType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
         #{type,jdbcType=VARCHAR}, #{purpose,jdbcType=VARCHAR}, #{overview,jdbcType=VARCHAR},
-        #{feedback,jdbcType=VARCHAR}, #{visitTime}, #{createTime},#{objectId})
+        #{feedback,jdbcType=VARCHAR}, #{visitTime}, #{createTime},#{objectId},#{tenantId})
     </insert>
     <update id="update" parameterType="com.ym.mec.biz.dal.entity.StudentVisit">
         <!--@mbg.generated-->
@@ -82,7 +83,7 @@
                 object_id_ = #{objectId},
             </if>
         </set>
-        where id_ = #{id,jdbcType=INTEGER}
+        where id_ = #{id,jdbcType=INTEGER} and tenant_id_ = #{tenantId}
     </update>
 
     <select id="queryPage" resultMap="StudentVisit">
@@ -105,6 +106,7 @@
     </select>
     <sql id="queryPageSql">
         <where>
+        	sv.tenant_id_ = #{tenantId}
             <if test="search != null and search != ''">
                 AND (sv.object_id_ = #{search} OR t.id_ = #{search} OR s.id_ = #{search} OR t.real_name_ LIKE CONCAT('%',#{search},'%') OR s.username_ LIKE CONCAT('%',#{search},'%'))
             </if>

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

@@ -24,6 +24,7 @@
         <result column="platform_account_no_" property="detail.platformAccountNo"/>
         <result column="balance_" property="detail.balance"/>
         <result column="real_name_" property="user.realName"/>
+        <result column="tenant_id_" property="tenantId"/>
     </resultMap>
     
     <!-- 根据主键查询一条记录 -->
@@ -33,16 +34,16 @@
 
     <!-- 全查询 -->
     <select id="findAll" resultMap="StudentWithdraw">
-		SELECT * FROM student_withdraw ORDER BY id_
+		SELECT * FROM student_withdraw where tenant_id_ = #{tenantId} ORDER BY id_
 	</select>
 
     <!-- 向数据库增加一条记录 -->
     <insert id="insert" parameterType="com.ym.mec.biz.dal.entity.StudentWithdraw" useGeneratedKeys="true" keyColumn="id"
             keyProperty="id">
         INSERT INTO student_withdraw
-        (id_,user_id_,bank_card_no_,trans_no_,status_,amount_,fee_user_,fee_platform_,description_,comment_,create_time_,modify_time_,withdraw_no_)
+        (id_,user_id_,bank_card_no_,trans_no_,status_,amount_,fee_user_,fee_platform_,description_,comment_,create_time_,modify_time_,withdraw_no_,tenant_id_)
         VALUES(#{id},#{userId},#{bankCardNo},#{transNo},#{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-        #{amount},#{feeUser},#{feePlatform},#{description},#{comment},now(),now(),#{withdrawNo})
+        #{amount},#{feeUser},#{feePlatform},#{description},#{comment},now(),now(),#{withdrawNo},#{tenantId})
     </insert>
 
     <!-- 根据主键查询一条记录 -->
@@ -83,7 +84,7 @@
                 withdraw_no_ = #{withdrawNo},
             </if>
         </set>
-        WHERE id_ = #{id}
+        WHERE id_ = #{id} and tenant_id_ = #{tenantId}
     </update>
 
     <!-- 根据主键删除一条记录 -->
@@ -96,6 +97,7 @@
         SELECT sw.*,cad.platform_account_no_,cad.trans_type_,su.real_name_,cad.balance_
         FROM student_withdraw sw,sys_user_cash_account_detail cad ,sys_user su
         where cad.type_ = 'WITHDRAW' and sw.id_ = cad.attribute1_ and su.id_ = sw.user_id_ and sw.status_ = cad.status_
+        	and sw.tenant_id_ = #{tenantId}
         <if test="userId != null">
             and sw.user_id_ = #{userId}
         </if>
@@ -112,7 +114,7 @@
     <!-- 查询当前表的总记录数 -->
     <select id="queryCount" resultType="int">
 		SELECT COUNT(sw.id_) FROM student_withdraw sw,sys_user su
-        where  su.id_ = sw.user_id_
+        where  su.id_ = sw.user_id_ and sw.tenant_id_ = #{tenantId}
             <if test="userId != null">
                 and sw.user_id_ = #{userId}
             </if>
@@ -127,18 +129,14 @@
     <select id="getByUserId" resultMap="StudentWithdraw" parameterType="Long">
         SELECT * FROM student_withdraw
         <where>
-            <if test="userId != null">
                 user_id_ = #{userId}
-            </if>
         </where>
         LIMIT 1
     </select>
     <select id="queryByUserId" resultType="com.ym.mec.biz.dal.entity.StudentWithdraw">
         SELECT * FROM student_withdraw
         <where>
-            <if test="userId != null">
               FIND_IN_SET(user_id_,#{userIds})
-            </if>
         </where>
         GROUP BY user_id_
     </select>

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

@@ -5,6 +5,7 @@
         <!--@mbg.generated-->
         <!--@Table subject_change-->
         <id column="id_" property="id"/>
+        <result column="tenant_id_" property="tenantId"/>
         <result column="edu_teacher_id_" property="eduTeacherId"/>
         <result column="eduTeacher" property="eduTeacher"/>
         <result column="student_id_" property="studentId"/>
@@ -59,7 +60,7 @@
         original_cost_,change_musical_price_,change_accessories_, change_accessories_price_,change_cost_, goods_margin_,
         course_margin_,cost_margin_,sell_amount_,order_id_,order_no_,trans_no_,
         status_,payment_channel_,mer_no_,sell_time_,create_time_,
-        update_time,version_
+        update_time,version_,tenant_id_
     </sql>
     <select id="get" parameterType="java.lang.Integer" resultMap="SubjectChange">
         <!--@mbg.generated-->
@@ -83,7 +84,7 @@
         change_subject_id_,change_course_fee_, change_musical_, change_musical_price_,
         change_accessories_, change_accessories_price_, change_cost_,goods_margin_,
         course_margin_,cost_margin_,sell_amount_,order_id_,
-        order_no_,trans_no_,status_,sell_time_, create_time_, update_time,version_)
+        order_no_,trans_no_,status_,sell_time_, create_time_, update_time,version_,tenant_id_)
         values
         (#{studentId},#{eduTeacherId},#{organId},#{cooperationOrganId},#{musicGroupId},#{originalOrderId},#{originalSubjectId},#{originalCourseFee},
         #{originalMusical},
@@ -95,7 +96,7 @@
         #{changeMusicalPrice}, #{changeAccessories}, #{changeAccessoriesPrice},#{changeCost}, #{goodsMargin},
         #{courseMargin},#{costMargin},
         #{sellAmount},#{orderId},#{orderNo},#{transNo},#{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{sellTime},
-        #{createTime}, #{updateTime},#{version})
+        #{createTime}, #{updateTime},#{version},#{tenantId})
     </insert>
     <update id="update" parameterType="com.ym.mec.biz.dal.entity.SubjectChange">
         <!--@mbg.generated-->
@@ -190,7 +191,7 @@
             </if>
             version_ = version_+1
         </set>
-        where id_ = #{id} AND version_ = #{version}
+        where id_ = #{id} AND version_ = #{version} and tenant_id_ = #{tenantId}
     </update>
 
     <select id="getStudentLastChange" resultMap="SubjectChange">
@@ -238,6 +239,7 @@
     </select>
     <sql id="queryPageSql">
         <where>
+        	sc.tenant_id_ = #{tenantId}
             <if test="search != null and search != ''">
                 AND (sc.order_no_ = #{search} OR sc.trans_no_ = #{search} OR s.username_ LIKE CONCAT('%',#{search},'%'))
             </if>