update

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

@@ -6,8 +6,6 @@ import org.apache.ibatis.annotations.Param;
 
 public interface SysCouponDao extends BaseDAO<Integer, SysCoupon> {
 
-    SysCoupon getWithName(@Param("name") String name);
-
     SysCoupon lockCoupon(@Param("id") Integer id);
 	
 }

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

@@ -58,8 +58,6 @@ public interface SysMusicCompareRecordDao extends BaseDAO<Long, SysMusicCompareR
     List<MusicCompareRankingDto> queryMusicGroupStudentTrainData(Map<String, Object> params);
     int countMusicGroupStudentTrainData(Map<String, Object> params);
 
-    List<EduOrganStudentListDto> queryStudentTrainData(@Param("studentIds") List<Integer> studentIds);
-
     /**
      * 老师端首页学员训练统计
      * @param params

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

@@ -14,6 +14,6 @@ public interface SysMusicCompareWeekDataDao extends BaseDAO<Integer, SysMusicCom
 
     List<MusicCompareRankingDto> getUserTrainStat(@Param("monday") String monday,
                                                   @Param("orderType") Integer orderType,
-                                                  @Param("heardLevel") String heardLevel);
+                                                  @Param("heardLevel") String heardLevel,@Param("tenantId") Integer tenantId);
 	
 }

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

@@ -1,14 +1,13 @@
 package com.ym.mec.biz.dal.entity;
 
-import com.ym.mec.biz.dal.enums.MessageTypeEnum;
-import com.ym.mec.common.entity.BaseEntity;
-
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
+import com.ym.mec.biz.dal.enums.MessageTypeEnum;
+
 /**
  * 对应数据库表(sys_message_config):
  */
-public class SysMessageConfig extends BaseEntity {
+public class SysMessageConfig {
 
 	/**  */
 	private Integer id;

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

@@ -166,7 +166,7 @@ public class SysMusicCompareRecordServiceImpl extends BaseServiceImpl<Long, SysM
 		StatDto result = new StatDto();
 		MusicCompareRankingDto head = new MusicCompareRankingDto();
 		head.setUserId(queryInfo.getUserId());
-		List<MusicCompareRankingDto> userTrainStat = sysMusicCompareWeekDataDao.getUserTrainStat(queryInfo.getStartTime(), queryInfo.getOrderType(), Objects.isNull(queryInfo.getHeardLevel())?null:queryInfo.getHeardLevel().getCode());
+		List<MusicCompareRankingDto> userTrainStat = sysMusicCompareWeekDataDao.getUserTrainStat(queryInfo.getStartTime(), queryInfo.getOrderType(), Objects.isNull(queryInfo.getHeardLevel())?null:queryInfo.getHeardLevel().getCode(),queryInfo.getTeacherId());
 		List<MusicCompareRankingDto> detail = new ArrayList<>();
 
 		List<Integer> studentIds = userTrainStat.stream().limit(10).map(MusicCompareRankingDto::getUserId).collect(Collectors.toList());

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

@@ -27,7 +27,7 @@
             channel_,
             type_,
             status_,
-            version
+            version,tenant_id_
     </sql>
     <select id="get" parameterType="java.lang.Integer" resultMap="SysAccount">
         <!--@mbg.generated-->
@@ -73,6 +73,7 @@
             <if test="version != null">
                 version,
             </if>
+            tenant_id_
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="company != null">
@@ -102,6 +103,7 @@
             <if test="version != null">
                 #{version,jdbcType=INTEGER},
             </if>
+            #{tenantId}
         </trim>
     </insert>
     <update id="update" parameterType="com.ym.mec.biz.dal.entity.SysAccount">
@@ -136,7 +138,7 @@
                 version = version+1,
             </if>
         </set>
-        where id_ = #{id,jdbcType=INTEGER} AND version =#{version}
+        where id_ = #{id,jdbcType=INTEGER} AND version =#{version} and tenant_id_ = #{tenantId}
     </update>
 
     <select id="getAccount" resultMap="SysAccount">
@@ -167,9 +169,7 @@
 
     <select id="getPerAccount" resultMap="SysAccount">
         SELECT * FROM sys_account WHERE status_=1 AND type_='PER'
-        <if test="channel != null">
             AND channel_ = #{channel}
-        </if>
     </select>
     <select id="getAdaAccount" resultMap="SysAccount">
         SELECT * FROM sys_account WHERE routing_organ_id_ = #{organId} AND channel_=#{channel} AND status_ =1 LIMIT 1

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

@@ -18,6 +18,7 @@
 		<result column="payment_order_id_" property="paymentOrderId" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
+        <result column="tenant_id_" property="tenantId"/>
 	</resultMap>
 
 	<resultMap id="SysCouponCodeDto" type="com.ym.mec.biz.dal.dto.SysCouponCodeDto">
@@ -48,7 +49,7 @@
 
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="SysCouponCode">
-		SELECT * FROM sys_coupon_code ORDER BY id_
+		SELECT * FROM sys_coupon_code where tenant_id_ = #{tenantId} ORDER BY id_
 	</select>
 
 	<!-- 向数据库增加一条记录 -->
@@ -59,18 +60,18 @@
 		</selectKey>
 		-->
 		INSERT INTO sys_coupon_code (coupon_id_,code_,usage_status_,user_id_,used_time_,use_start_date_,use_deadline_date_,
-		                             payment_order_id_,create_time_,update_time_)
+		                             payment_order_id_,create_time_,update_time_,tenant_id_)
 							 VALUES(#{couponId},#{code},#{usageStatus},#{userId},#{usedTime},#{useStartDate},#{useDeadlineDate},
-									#{paymentOrderId},NOW(),NOW())
+									#{paymentOrderId},NOW(),NOW(),#{tenantId})
 	</insert>
 
 	<insert id="batchInsert" parameterType="com.ym.mec.biz.dal.entity.SysCouponCode" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
 		INSERT INTO sys_coupon_code (coupon_id_,code_,usage_status_,user_id_,used_time_,use_start_date_,use_deadline_date_,
-		payment_order_id_,create_time_,update_time_)
+		payment_order_id_,create_time_,update_time_,tenant_id_)
 		VALUE
 		<foreach collection="couponCodes" item="couponCode" separator=",">
 			(#{couponCode.couponId},#{couponCode.code},#{couponCode.usageStatus},#{couponCode.userId},#{couponCode.usedTime},#{couponCode.useStartDate},#{couponCode.useDeadlineDate},
-			#{couponCode.paymentOrderId},NOW(),NOW())
+			#{couponCode.paymentOrderId},NOW(),NOW(),#{tenantId})
 		</foreach>
 	</insert>
 
@@ -104,7 +105,7 @@
 			</if>
 				used_time_ = NOW()
 		</set>
-		WHERE id_ = #{id}
+		WHERE id_ = #{id} and tenant_id_ = #{tenantId}
 	</update>
 	<update id="quit">
 		UPDATE sys_coupon_code SET usage_status_ = 0,used_time_ = NULL,update_time_ = NOW() WHERE FIND_IN_SET(id_,#{couponCodeId})
@@ -124,12 +125,12 @@
 
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="SysCouponCode" parameterType="map">
-		SELECT * FROM sys_coupon_code ORDER BY id_ <include refid="global.limit"/>
+		SELECT * FROM sys_coupon_code where tenant_id_ = #{tenantId} ORDER BY id_ <include refid="global.limit"/>
 	</select>
 
 	<!-- 查询当前表的总记录数 -->
 	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM sys_coupon_code
+		SELECT COUNT(*) FROM sys_coupon_code where tenant_id_ = #{tenantId}
 	</select>
 
 	<select id="countWithUserAndCoupon" resultType="int">
@@ -138,6 +139,7 @@
 
 	<sql id="querySysCouponUseListCondition">
 		<where>
+			scc.tenant_id_ = #{tenantId}
 			<if test="userId!=null">
 				AND scc.user_id_=#{userId}
 			</if>
@@ -216,6 +218,7 @@
 		SELECT COUNT(suc.coupon_id_) num_,sc.face_value_,su.username_ FROM sys_coupon_code suc
 		LEFT JOIN sys_user su ON su.id_ = suc.user_id_
 		LEFT JOIN sys_coupon sc ON sc.id_ = suc.coupon_id_
+		where suc.tenant_id_ = #{tenantId}
 		GROUP BY suc.user_id_,suc.payment_order_id_,suc.coupon_id_
 		<include refid="global.limit"/>
 	</select>
@@ -224,6 +227,7 @@
 		SELECT COUNT(suc.coupon_id_) num_,sc.face_value_,su.username_ FROM sys_coupon_code suc
 		LEFT JOIN sys_user su ON su.id_ = suc.user_id_
 		LEFT JOIN sys_coupon sc ON sc.id_ = suc.coupon_id_
+		where suc.tenant_id_ = #{tenantId}
 		GROUP BY suc.user_id_,suc.payment_order_id_,suc.coupon_id_)t
 	</select>
 	<select id="findByIdList" resultMap="SysCouponCodeDto">

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

@@ -27,6 +27,7 @@
 		<result column="warning_status_" property="warningStatus" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
+        <result column="tenant_id_" property="tenantId"/>
 	</resultMap>
 
 	<!-- 根据主键查询一条记录 -->
@@ -36,18 +37,18 @@
 
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="SysCoupon">
-		SELECT * FROM sys_coupon ORDER BY id_
+		SELECT * FROM sys_coupon where tenant_id_ = #{tenantId} ORDER BY id_
 	</select>
 
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.SysCoupon" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
 		INSERT INTO sys_coupon (id_,name_,description_,status_,type_,face_value_,full_amount_,limit_exchange_num_,effective_type_,deadline_,
 		                        effective_start_time_, effective_expire_time_,end_date_,start_date_,stock_count_,consume_num_,warning_stock_num_,
-		                        create_time_,update_time_)
+		                        create_time_,update_time_,tenant_id_)
 		                        VALUES(#{id},#{name},#{description},#{status},#{type, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{faceValue},#{fullAmount},#{limitExchangeNum},
 		                               #{effectiveType, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{deadline},
 		                               #{effectiveStartTime},#{effectiveExpireTime},#{endDate},#{startDate},#{stockCount},#{consumeNum},#{warningStockNum},
-		                               NOW(), NOW())
+		                               NOW(), NOW(),#{tenantId})
 	</insert>
 
 	<!-- 根据主键查询一条记录 -->
@@ -99,7 +100,7 @@
 			</if>
 				update_time_ = NOW()
 		</set>
-		WHERE id_ = #{id}
+		WHERE id_ = #{id} and tenant_id_ = #{tenantId}
 	</update>
 
 	<!-- 根据主键删除一条记录 -->
@@ -109,6 +110,7 @@
 
 	<sql id="queryCondition">
 		<where>
+			tenant_id_ = #{tenantId}
 			<if test="status != null">
 				AND status_ = #{status}
 			</if>
@@ -139,7 +141,4 @@
 		SELECT * FROM sys_coupon WHERE id_ = #{id} FOR UPDATE
 	</select>
 
-	<select id="getWithName" resultMap="SysCoupon">
-		SELECT * FROM sys_coupon WHERE name_ = #{name}
-	</select>
 </mapper>

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

@@ -19,6 +19,7 @@
 		<result column="del_flag_" property="delFlag" />
 		<result column="update_time_" property="updateTime" />
 		<result column="create_time_" property="createTime" />
+        <result column="tenant_id_" property="tenantId"/>
 	</resultMap>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -28,13 +29,13 @@
 	
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="SysExamSong">
-		SELECT * FROM sys_exam_song ORDER BY id_
+		SELECT * FROM sys_exam_song where tenant_id_ = #{tenantId} ORDER BY id_
 	</select>
 	
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.SysExamSong" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		INSERT INTO sys_exam_song (name_,type_,subject_ids_,speed_,url_,create_user_id_,update_time_,create_time_)
-		VALUES(#{name},#{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{subjectIds},#{speed},#{url},#{createUserId},NOW(),NOW())
+		INSERT INTO sys_exam_song (name_,type_,subject_ids_,speed_,url_,create_user_id_,update_time_,create_time_,tenant_id_)
+		VALUES(#{name},#{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{subjectIds},#{speed},#{url},#{createUserId},NOW(),NOW(),#{tenantId})
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -64,7 +65,7 @@
 		</if>
 		update_time_ = NOW()
 		</set>
-		 WHERE id_ = #{id}
+		 WHERE id_ = #{id} and tenant_id_ = #{tenantId}
 	</update>
 	
 	<!-- 根据主键删除一条记录 -->
@@ -73,7 +74,7 @@
 	</update>
 	<sql id="queryPageSql">
 		<where>
-			ses.del_flag_ = 0
+			ses.del_flag_ = 0 and ses.tenant_id_ = #{tenantId}
 			<if test="search != null and search != ''">
 				AND (ses.id_ = #{search} OR ses.name_ LIKE CONCAT('%',#{search},'%'))
 			</if>

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

@@ -18,26 +18,27 @@
 		<result column="status_" property="status" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
+        <result column="tenant_id_" property="tenantId"/>
 	</resultMap>
 	
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="SysImComplaint">
-		SELECT * FROM sys_im_complaint
+		SELECT * FROM sys_im_complaint where tenant_id_ = #{tenantId}
 	</select>
 	
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.SysImComplaint" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		INSERT INTO sys_im_complaint (type_,url_,memo_,user_id_,target_id_,operator_,operator_time_,status_,create_time_,update_time_)
-		VALUES(#{type},#{url},#{memo},#{userId},#{targetId},#{operator},#{operatorTime},#{status},NOW(),NOW())
+		INSERT INTO sys_im_complaint (type_,url_,memo_,user_id_,target_id_,operator_,operator_time_,status_,create_time_,update_time_,tenant_id_)
+		VALUES(#{type},#{url},#{memo},#{userId},#{targetId},#{operator},#{operatorTime},#{status},NOW(),NOW(),#{tenantId})
 	</insert>
 	
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="SysImComplaint" parameterType="map">
-		SELECT * FROM sys_im_complaint <include refid="global.limit"/>
+		SELECT * FROM sys_im_complaint where tenant_id_ = #{tenantId} <include refid="global.limit"/>
 	</select>
 	
 	<!-- 查询当前表的总记录数 -->
 	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM sys_im_complaint
+		SELECT COUNT(*) FROM sys_im_complaint where tenant_id_ = #{tenantId}
 	</select>
 </mapper>

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

@@ -22,6 +22,7 @@
         <result column="read_status_" property="readStatus"/>
         <result column="group_" property="group"/>
         <result column="jpush_type_" property="jpushType"/>
+        <result column="tenant_id_" property="tenantId"/>
     </resultMap>
     
     <resultMap type="com.ym.mec.biz.dal.dto.SysMessageDto" id="messageDto" extends="message">
@@ -35,6 +36,7 @@
 
 	<sql id="queryCondition">
 		<where>
+			m.tenant_id_ = #{tenantId}
 			<if test="jpushType != null and jpushType != ''">
 				and (m.jpush_type_ = #{jpushType} OR m.jpush_type_ IS NULL)
 			</if>
@@ -80,9 +82,9 @@
 
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.SysMessage">
 		insert into sys_message (user_id_,title_, content_,type_, receiver_,
-		send_time_, error_msg_,memo_, create_on_,modify_on_,group_,jpush_type_)
+		send_time_, error_msg_,memo_, create_on_,modify_on_,group_,jpush_type_,tenant_id_)
 		values (#{userId}, #{title},#{content},#{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-				#{receiver},now(),#{errorMsg},#{memo},now(),now(),#{group},#{jpushType})
+				#{receiver},now(),#{errorMsg},#{memo},now(),now(),#{group},#{jpushType},#{tenantId})
 	</insert>
 
 	<insert id="batchInsert" parameterType="com.ym.mec.biz.dal.entity.SysMessage">
@@ -90,7 +92,7 @@
 		title_, content_,
 		type_, status_, receiver_,
 		send_time_, error_msg_,read_status_,memo_, create_on_,
-		modify_on_,group_,jpush_type_)
+		modify_on_,group_,jpush_type_,tenant_id_)
 		values
 		<foreach collection="list" item="item" index="index"
 			separator=",">
@@ -101,7 +103,7 @@
 			#{item.status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}, #{item.receiver,jdbcType=VARCHAR},
 			#{item.sendTime},#{item.errorMsg,jdbcType=VARCHAR},#{item.readStatus},#{item.memo},
 			#{item.createOn},
-			#{item.modifyOn},#{item.group},#{item.jpushType}
+			#{item.modifyOn},#{item.group},#{item.jpushType},#{item.tenantId}
 			)
 		</foreach>
 	</insert>
@@ -149,7 +151,7 @@
 				group_ = #{group},
 			</if>
 		</set>
-		where id_ = #{id,jdbcType=BIGINT}
+		where id_ = #{id,jdbcType=BIGINT} and tenant_id_ = #{tenantId}
 	</update>
 	<update id="updateStatus">
 		update sys_message set read_status_=#{status}

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

@@ -29,6 +29,7 @@
 		<result column="feature_" property="feature" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler" />
 		<result column="monday_" property="monday"/>
 		<result column="create_time_" property="createTime" />
+        <result column="tenant_id_" property="tenantId"/>
 	</resultMap>
 
 	<!-- 根据主键查询一条记录 -->
@@ -38,18 +39,18 @@
 
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="SysMusicCompareRecord">
-		SELECT * FROM sys_music_compare_record ORDER BY id_
+		SELECT * FROM sys_music_compare_record where tenant_id_ = #{tenantId} ORDER BY id_
 	</select>
 
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.SysMusicCompareRecord" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
 		INSERT INTO sys_music_compare_record (id_,user_id_,sys_music_score_id_,heard_level_,behavior_id_,score_data_,score_,intonation_,cadence_,integrity_,
 		                                      record_file_path_,video_file_path_,device_type_,client_id_,play_time_,speed_,monday_,
-												source_time_,feature_,create_time_,update_time_)
+												source_time_,feature_,create_time_,update_time_,tenant_id_)
 		VALUES(#{id},#{userId},#{sysMusicScoreId},#{heardLevel,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{behaviorId},#{scoreData},
 		       #{score},#{intonation},#{cadence},#{integrity},
 		       #{recordFilePath},#{videoFilePath},#{deviceType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{clientId},#{playTime},#{speed},#{monday},
-		       #{sourceTime},#{feature,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}, NOW(), NOW())
+		       #{sourceTime},#{feature,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}, NOW(), NOW(),#{tenantId})
 	</insert>
 
 	<!-- 根据主键查询一条记录 -->
@@ -110,7 +111,7 @@
 			heard_level_ = #{heardLevel,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
 		</if>
 		update_time_ = NOW()
-	</set> WHERE id_ = #{id}
+	</set> WHERE id_ = #{id} and tenant_id_ = #{tenantId}
 	</update>
 
 	<!-- 根据主键删除一条记录 -->
@@ -120,6 +121,7 @@
 
 	<sql id="queryCondition">
 		<where>
+			smcr.tenant_id_ = #{tenantId}
 			<if test="userId!=null">
 				AND smcr.user_id_=#{userId}
 			</if>
@@ -203,7 +205,7 @@
 
 	<sql id="queryMusicGroupStudentTrainDataConditon">
 		<where>
-			sr.music_group_status_='NORMAL' AND stu.user_id_ IS NOT NULL
+			sr.music_group_status_='NORMAL' AND stu.user_id_ IS NOT NULL and sr.tenant_id_ = #{tenantId}
 			<if test="startTime!=null and endTime!=null">
 				AND DATE_FORMAT( smcr.create_time_, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime}
 			</if>
@@ -257,16 +259,6 @@
 		<include refid="queryMusicGroupStudentTrainDataConditon"/>
 	</select>
 
-	<select id="queryStudentTrainData" resultType="com.ym.mec.biz.dal.dto.EduOrganStudentListDto">
-		SELECT
-			user_id_ studentId,
-			COUNT(DISTINCT behavior_id_) cloudStudyUseNum,
-			SUM(play_time_) cloudStudyUseTime
-		FROM
-			sys_music_compare_record
-		GROUP BY
-			user_id_
-	</select>
 	<resultMap id="CountStudentTrainDataDto" type="com.ym.mec.biz.dal.dto.CountStudentTrainDataDto">
 		<result property="trainNum" column="train_num_"/>
 		<result property="recordNum" column="record_num_"/>
@@ -360,12 +352,10 @@
 						LEFT JOIN sys_user su ON smcr.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>
 				GROUP BY
 					user_id_
 				HAVING
@@ -387,12 +377,10 @@
 						LEFT JOIN sys_user su ON smcr.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>
 				GROUP BY
 					user_id_
 				HAVING

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

@@ -15,12 +15,13 @@
 		<result column="beginner_max_score_" property="beginnerMaxScore" />
 		<result column="advanced_max_score_" property="advancedMaxScore" />
 		<result column="performer_max_score_" property="performerMaxScore" />
+        <result column="tenant_id_" property="tenantId"/>
 	</resultMap>
 	
 	
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="SysMusicCompareWeekData">
-		SELECT * FROM sys_music_compare_week_data
+		SELECT * FROM sys_music_compare_week_data where tenant_id_ = #{tenantId}
 	</select>
 	
 	<!-- 向数据库增加一条记录 -->
@@ -33,9 +34,9 @@
 		INSERT INTO sys_music_compare_week_data (user_id_,monday_,train_num_,train_days_,train_time_,
 		                                         beginner_max_score_,beginner_max_score_id_,advanced_max_score_,advanced_max_score_id_,
 		                                         performer_max_score_,performer_max_score_id_,
-		                                         create_time_,update_time_)
+		                                         create_time_,update_time_,tenant_id_)
 		VALUES(#{userId},#{monday},#{trainNum},#{trainDays},#{trainTime},#{beginnerMaxScore},#{beginnerMaxScoreId},
-		       #{advancedMaxScore},#{advancedMaxScoreId},#{performerMaxScore},#{performerMaxScoreId},NOW(),NOW())
+		       #{advancedMaxScore},#{advancedMaxScoreId},#{performerMaxScore},#{performerMaxScoreId},NOW(),NOW(),#{tenantId})
 	</insert>
 	
 	<update id="update" parameterType="com.ym.mec.biz.dal.entity.SysMusicCompareWeekData">
@@ -70,17 +71,17 @@
 			</if>
 			update_time_ = NOW()
 		</set>
-		WHERE user_id_=#{userId} AND monday_ = #{monday}
+		WHERE user_id_=#{userId} AND monday_ = #{monday} and tenant_id_ = #{tenantId}
 	</update>
 	
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="SysMusicCompareWeekData" parameterType="map">
-		SELECT * FROM sys_music_compare_week_data <include refid="global.limit"/>
+		SELECT * FROM sys_music_compare_week_data where tenant_id_ = #{tenantId} <include refid="global.limit"/>
 	</select>
 	
 	<!-- 查询当前表的总记录数 -->
 	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM sys_music_compare_week_data
+		SELECT COUNT(*) FROM sys_music_compare_week_data where tenant_id_ = #{tenantId}
 	</select>
 
 	<select id="getWithUserAndMonday" resultMap="SysMusicCompareWeekData">
@@ -129,7 +130,7 @@
 			</if>
 		</if>
 		WHERE smcwd.monday_ = #{monday}
-			AND stu.user_id_=smcwd.user_id_
+			AND stu.user_id_=smcwd.user_id_ and smcwd.tenant_id_ = #{tenantId}
 			<if test="orderType==1">
 				<if test="heardLevel==null">
 					AND smcwd.advanced_max_score_ > 0

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

@@ -22,11 +22,12 @@
         <result column="other_fee_" property="otherFee"/>
         <result column="create_time_" property="createTime"/>
         <result column="update_time_" property="updateTime"/>
+        <result column="tenant_id_" property="tenantId"/>
     </resultMap>
     <sql id="Base_Column_List">
         <!--@mbg.generated-->
         id_, organ_id_,account_type_,pay_type_,yq_mer_no_,hf_mer_no_,type_,route_scale_,type_route_scale_,create_time_,
-        update_time_
+        update_time_,tenant_id_
     </sql>
     <select id="get" parameterType="java.lang.Integer" resultMap="SysPaymentConfig">
         <!--@mbg.generated-->
@@ -75,6 +76,7 @@
             <if test="updateTime != null">
                 update_time_,
             </if>
+            tenant_id_
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="organId != null">
@@ -107,6 +109,7 @@
             <if test="updateTime != null">
                 #{updateTime},
             </if>
+            #{tenantId}
         </trim>
     </insert>
     <update id="update" parameterType="com.ym.mec.biz.dal.entity.SysPaymentConfig">
@@ -139,18 +142,19 @@
             </if>
             update_time_ = now()
         </set>
-        where id_ = #{id,jdbcType=INTEGER}
+        where id_ = #{id,jdbcType=INTEGER} and tenant_id_ = #{tenantId}
     </update>
 
     <!-- 全查询 -->
     <select id="findAll" resultMap="SysPaymentConfig">
         SELECT *
-        FROM sys_payment_config
+        FROM sys_payment_config where tenant_id_ = #{tenantId}
         ORDER BY id_
     </select>
 
     <sql id="queryCondition">
         <where>
+        	spc.tenant_id_ = #{tenantId}
             <if test="organId!=null">
                 AND spc.organ_id_=#{organId}
             </if>

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

@@ -24,6 +24,7 @@
         <result column="trans_no_" property="transNo"/>
         <result column="id_card_no_" property="idCardNo"/>
         <result column="real_name_" property="realName"/>
+        <result column="tenant_id_" property="tenantId"/>
     </resultMap>
     <delete id="del">
         UPDATE sys_user_bank_card SET status_ = 0 WHERE id_ = #{id} AND user_id_ = #{userId}
@@ -36,7 +37,7 @@
 
     <!-- 全查询 -->
     <select id="findAll" resultMap="SysUserBankCard">
-		SELECT * FROM sys_user_bank_card WHERE status_ != 0 ORDER BY id_
+		SELECT * FROM sys_user_bank_card WHERE status_ != 0 and tenant_id_ = #{tenantId} ORDER BY id_
 	</select>
 
     <!-- 向数据库增加一条记录 -->
@@ -48,9 +49,9 @@
         </selectKey>
         -->
         INSERT INTO sys_user_bank_card
-        (id_,user_id_,is_default_,bank_name_,bank_code_,card_no_,province_,city_,address,create_on_,modify_on_,is_quick_,mobile_phone_,trans_no_,real_name_,id_card_no_)
+        (id_,user_id_,is_default_,bank_name_,bank_code_,card_no_,province_,city_,address,create_on_,modify_on_,is_quick_,mobile_phone_,trans_no_,real_name_,id_card_no_,tenant_id_)
         VALUES(#{id},#{userId},#{isDefault},#{bankName},#{bankCode},#{cardNo},#{province},
-        #{city},#{address},now(),now(),#{isQuick,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{mobilePhone},#{transNo},#{realName},#{idCardNo})
+        #{city},#{address},now(),now(),#{isQuick,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{mobilePhone},#{transNo},#{realName},#{idCardNo},#{tenantId})
     </insert>
 
     <!-- 根据主键查询一条记录 -->
@@ -103,7 +104,7 @@
                 real_name_ = #{realName},
             </if>
         </set>
-        WHERE id_ = #{id}
+        WHERE id_ = #{id} and tenant_id_ = #{tenantId}
     </update>
 
     <!-- 根据主键删除一条记录 -->
@@ -127,7 +128,7 @@
 
     <!-- 查询当前表的总记录数 -->
     <select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM sys_user_bank_card where status_ != 0
+		SELECT COUNT(*) FROM sys_user_bank_card where status_ != 0 and tenant_id_ = #{tenantId}
 	</select>
 
     <select id="findByUser" resultMap="SysUserBankCard">

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

@@ -29,6 +29,7 @@
         <result column="organ_name_" property="organName"/>
         <result column="platform_account_no_" property="platformAccountNo"/>
         <result column="group_id_" property="groupId"/>
+        <result column="tenant_id_" property="tenantId"/>
     </resultMap>
 
     <!-- 根据主键查询一条记录 -->
@@ -39,7 +40,7 @@
     <!-- 全查询 -->
     <select id="findAll" resultMap="SysUserCashAccountDetail">
         SELECT *
-        FROM sys_user_cash_account_detail
+        FROM sys_user_cash_account_detail where tenant_id_ = #{tenantId}
         ORDER BY id_
     </select>
 
@@ -66,6 +67,7 @@
             <if test="attribute!=null">attribute1_,</if>
             <if test="channel!=null">channel_,</if>
             <if test="platformAccountNo!=null">platform_account_no_,</if>
+            tenant_id_
         </trim>
         VALUES
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -87,6 +89,7 @@
             <if test="attribute!=null">#{attribute},</if>
             <if test="channel!=null">#{channel},</if>
             <if test="platformAccountNo!=null">#{platformAccountNo},</if>
+            #{tenantId}
         </trim>
     </insert>
 
@@ -94,7 +97,7 @@
             keyColumn="id" keyProperty="id">
         INSERT INTO sys_user_cash_account_detail
         (user_id_,trans_no_,type_,trans_type_,status_,amount_,balance_,description_,comment_,
-        create_time_,update_time_,attribute1_,channel_,platform_account_no_,group_id_)
+        create_time_,update_time_,attribute1_,channel_,platform_account_no_,group_id_,tenant_id_)
         VALUE
         <foreach collection="sysUserCashAccountDetails" item="sysUserCashAccountDetail" separator=",">
             (#{sysUserCashAccountDetail.userId},#{sysUserCashAccountDetail.transNo},
@@ -103,7 +106,7 @@
             #{sysUserCashAccountDetail.status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
             #{sysUserCashAccountDetail.amount},#{sysUserCashAccountDetail.balance},#{sysUserCashAccountDetail.description},
             #{sysUserCashAccountDetail.comment},now(),now(),#{sysUserCashAccountDetail.attribute},#{sysUserCashAccountDetail.channel},
-            #{sysUserCashAccountDetail.platformAccountNo},#{sysUserCashAccountDetail.groupId})
+            #{sysUserCashAccountDetail.platformAccountNo},#{sysUserCashAccountDetail.groupId},#{sysUserCashAccountDetail.tenantId})
         </foreach>
     </insert>
 
@@ -155,7 +158,7 @@
                 platform_account_no_ = #{platformAccountNo},
             </if>
         </set>
-        WHERE id_ = #{id}
+        WHERE id_ = #{id} and tenant_id_ = #{tenantId}
     </update>
 
     <!-- 根据主键删除一条记录 -->
@@ -167,8 +170,9 @@
     <select id="queryPage" resultMap="SysUserCashAccountDetail" parameterType="map">
         SELECT * FROM sys_user_cash_account_detail
         <where>
+        	tenant_id_ = #{tenantId}
             <if test="userId != null">
-                user_id_ = #{userId}
+                and user_id_ = #{userId}
             </if>
             <if test="search != null and search != ''">
                 AND create_time_ LIKE CONCAT(#{search},'%')
@@ -185,8 +189,9 @@
     <select id="queryCount" resultType="int">
         SELECT COUNT(*) FROM sys_user_cash_account_detail
         <where>
+        	tenant_id_ = #{tenantId}
             <if test="userId != null">
-                user_id_ = #{userId}
+                and user_id_ = #{userId}
             </if>
             <if test="search != null and search != ''">
                 AND create_time_ LIKE CONCAT(#{search},'%')
@@ -209,9 +214,7 @@
         sys_user_cash_account_detail sucad
         left join sys_user u on sucad.user_id_ = u.id_
         where sucad.status_ = 'SUCCESS' and DATE_FORMAT(sucad.create_time_, '%Y%m' ) = DATE_FORMAT( CURDATE() , '%Y%m' ) and u.organ_id_ not in (36,38)
-        <if test="organId != null">
             AND FIND_IN_SET(u.organ_id_,#{organId})
-        </if>
     </select>
     <select id="countByTypeAndTime" resultType="java.lang.Integer">
       SELECT COUNT(s.id_) FROM sys_user_cash_account_detail s
@@ -221,8 +224,9 @@
 
     <sql id="queryAccountDetailCondition">
         <where>
+        	tenant_id_ = #{tenantId}
             <if test="userId!=null">
-                user_id_=#{userId}
+                and user_id_=#{userId}
             </if>
         </where>
     </sql>
@@ -252,6 +256,7 @@
         LEFT JOIN student s ON s.user_id_ = su.id_
         LEFT JOIN `subject` sb ON FIND_IN_SET(sb.id_,s.subject_id_list_)
         <where>
+        	cad.tenant_id_ = #{queryInfo.tenantId}
             <if test="queryInfo.userId != null">
                 AND cad.user_id_ = #{queryInfo.userId}
             </if>

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

@@ -21,6 +21,7 @@
         <result column="group_id_" property="groupId"/>
         <result column="group_name_" property="groupName"/>
         <result column="pay_time_" property="payTime"/>
+        <result column="tenant_id_" property="tenantId"/>
     </resultMap>
 
     <!-- 根据主键查询一条记录 -->
@@ -31,7 +32,7 @@
     <!-- 全查询 -->
     <select id="findAll" resultMap="SysUserCashAccountLog">
         SELECT *
-        FROM sys_user_cash_account_log
+        FROM sys_user_cash_account_log where tenant_id_ = #{tenantId}
         ORDER BY id_
     </select>
 
@@ -39,17 +40,17 @@
     <insert id="insert" parameterType="com.ym.mec.biz.dal.entity.SysUserCashAccountLog" useGeneratedKeys="true"
             keyColumn="id" keyProperty="id">
         INSERT INTO sys_user_cash_account_log (user_id_,organ_id_,trans_no_,return_fee_type_,group_type_,
-                                               group_id_,amount_,comment_,pay_time_,create_time_,update_time_)
+                                               group_id_,amount_,comment_,pay_time_,create_time_,update_time_,tenant_id_)
         VALUES(#{userId},#{organId},#{transNo},#{returnFeeType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
                #{groupType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{groupId},#{amount},
-               #{comment},#{payTime},NOW(),NOW())
+               #{comment},#{payTime},NOW(),NOW(),#{tenantId})
     </insert>
 
     <!-- 根据主键查询一条记录 -->
     <update id="update" parameterType="com.ym.mec.biz.dal.entity.SysUserCashAccountLog">
         UPDATE sys_user_cash_account_log
         SET comment_ = #{comment},trans_no_ = #{transNo},pay_time_ = #{payTime},update_time_ = NOW()
-        WHERE id_ = #{id}
+        WHERE id_ = #{id} and tenant_id_ = #{tenantId}
     </update>
 
     <!-- 根据主键删除一条记录 -->
@@ -75,6 +76,7 @@
     </select>
     <sql id="queryPageSql">
         <where>
+        	cal.tenant_id_ = #{tenantId}
             <if test="createStartTime != null">
                 AND DATE_FORMAT(cal.create_time_,'%Y-%m-%d') >= #{createStartTime}
             </if>

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

@@ -16,6 +16,7 @@
         <result column="status_" property="status" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <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="SysUserCashAccount">
-		SELECT * FROM sys_user_cash_account ORDER BY user_id_
+		SELECT * FROM sys_user_cash_account where tenant_id_ = #{tenantId} ORDER BY user_id_
 	</select>
 
     <!-- 向数据库增加一条记录 -->
     <insert id="insert" parameterType="com.ym.mec.biz.dal.entity.SysUserCashAccount" useGeneratedKeys="true"
             keyColumn="id" keyProperty="id">
         INSERT INTO sys_user_cash_account
-        (user_id_,currency_,create_time_,update_time)
-        VALUES(#{userId},#{currency},now(),now())
+        (user_id_,currency_,create_time_,update_time,tenant_id_)
+        VALUES(#{userId},#{currency},now(),now(),#{tenantId})
     </insert>
 
     <!-- 根据主键查询一条记录 -->
@@ -69,7 +70,7 @@
                 currency_ = #{currency},
             </if>
         </set>
-        WHERE user_id_ = #{userId}
+        WHERE user_id_ = #{userId} and tenant_id_ = #{tenantId}
     </update>
 
     <!-- 根据主键删除一条记录 -->
@@ -79,13 +80,13 @@
 
     <!-- 分页查询 -->
     <select id="queryPage" resultMap="SysUserCashAccount" parameterType="map">
-        SELECT * FROM sys_user_cash_account ORDER BY user_id_
+        SELECT * FROM sys_user_cash_account where tenant_id_ = #{tenantId} ORDER BY user_id_
         <include refid="global.limit"/>
     </select>
 
     <!-- 查询当前表的总记录数 -->
     <select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM sys_user_cash_account
+		SELECT COUNT(*) FROM sys_user_cash_account where tenant_id_ = #{tenantId}
 	</select>
     <select id="findByUserIds" resultMap="SysUserCashAccount">
         SELECT * FROM sys_user_cash_account WHERE user_id_ IN
@@ -99,6 +100,7 @@
         SELECT SUM(suca.balance_) FROM sys_user_cash_account suca
         LEFT JOIN sys_user su ON su.id_ = suca.user_id_
         <where>
+        suca.tenant_id_ = #{tenantId}
         <if test="organId != null">
             FIND_IN_SET(su.organ_id_,#{organId})
         </if>

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

@@ -13,6 +13,7 @@
 		<result column="name_" property="name" />
 		<result column="card_no_" property="cardNo" />
 		<result column="create_time_" property="createTime" />
+        <result column="tenant_id_" property="tenantId"/>
 	</resultMap>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -22,7 +23,7 @@
 	
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="SysUserTsign">
-		SELECT * FROM sys_user_tsign ORDER BY user_id_
+		SELECT * FROM sys_user_tsign where tenant_id_ = #{tenantId} ORDER BY user_id_
 	</select>
 	
 	<!-- 向数据库增加一条记录 -->
@@ -32,7 +33,7 @@
 		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
 		</selectKey>
 		-->
-		INSERT INTO sys_user_tsign (user_id_,account_id_,seal_data_,name_,card_no_,create_time_) VALUES(#{userId},#{accountId},#{sealData},#{name},#{cardNo},now())
+		INSERT INTO sys_user_tsign (user_id_,account_id_,seal_data_,name_,card_no_,create_time_,tenant_id_) VALUES(#{userId},#{accountId},#{sealData},#{name},#{cardNo},now(),#{tenantId})
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -56,7 +57,7 @@
 		<if test="createTime != null">
 		create_time_ = #{createTime},
 		</if>
-		</set> WHERE user_id_ = #{userId} 
+		</set> WHERE user_id_ = #{userId} and tenant_id_ = #{tenantId}
 	</update>
 	
 	<!-- 根据主键删除一条记录 -->
@@ -66,12 +67,12 @@
 	
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="SysUserTsign" parameterType="map">
-		SELECT * FROM sys_user_tsign ORDER BY user_id_ <include refid="global.limit"/>
+		SELECT * FROM sys_user_tsign where tenant_id_ = #{tenantId} ORDER BY user_id_ <include refid="global.limit"/>
 	</select>
 	
 	<!-- 查询当前表的总记录数 -->
 	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM sys_user_tsign
+		SELECT COUNT(*) FROM sys_user_tsign where tenant_id_ = #{tenantId}
 	</select>
 	
 	<select id="queryByCardNo" resultMap="SysUserTsign">

mec-common/common-core/src/main/java/com/ym/mec/common/entity/BaseEntity.java

@@ -1,8 +1,10 @@
 package com.ym.mec.common.entity;
 
+import com.ym.mec.common.tenant.TenantContextHolder;
+
 public class BaseEntity {
 
-	private Integer tenantId;
+	private Integer tenantId = TenantContextHolder.getTenantId();
 
 	public Integer getTenantId() {
 		return tenantId;

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

@@ -67,10 +67,6 @@ public class SysCouponController extends BaseController {
 			default:
 				return failed("请指定有效期类型");
 		}
-		SysCoupon sysCouponDaoWithName = sysCouponDao.getWithName(sysCoupon.getName());
-		if(Objects.nonNull(sysCouponDaoWithName)){
-			return failed("优惠券名称重复");
-		}
 		return succeed(sysCouponService.insert(sysCoupon));
 	}