update

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

@@ -14,7 +14,7 @@ public interface MemberPrivilegesItemDao extends BaseDAO<Integer, MemberPrivileg
      * @param parentId
      * @return
      */
-    List<MemberPrivilegesItem> findList(@Param("parentId") Integer parentId);
+    List<MemberPrivilegesItem> findList(@Param("parentId") Integer parentId,@Param("tenantId") Integer tenantId);
 
     void batchDel(@Param("collect") List<Integer> collect);
     

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

@@ -19,11 +19,12 @@
         <result column="month" property="month"/>
         <result column="organName" property="organName"/>
         <result column="userName" property="userName"/>
+		<result column="tenant_id_" property="tenantId" />
     </resultMap>
     <sql id="Base_Column_List">
         <!--@mbg.generated-->
         id_, inspection_id_, organ_id_, user_id_, item_, times_, planned_times_, submitted_times_,
-        memo_, operation_, create_time_, update_time_
+        memo_, operation_, create_time_, update_time_, tenant_id_
     </sql>
     <select id="get" parameterType="java.lang.Long" resultMap="InspectionItem">
         <!--@mbg.generated-->
@@ -41,10 +42,10 @@
             useGeneratedKeys="true">
         <!--@mbg.generated-->
         insert into inspection_item (inspection_id_, organ_id_, user_id_, item_, times_, planned_times_,
-        submitted_times_, memo_, operation_, create_time_, update_time_)
+        submitted_times_, memo_, operation_, create_time_, update_time_,tenant_id_)
         values (#{inspectionId}, #{organId}, #{userId}, #{item,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
         #{times}, #{plannedTimes},
-        #{submittedTimes}, #{memo}, #{operation}, #{createTime}, #{updateTime})
+        #{submittedTimes}, #{memo}, #{operation}, #{createTime}, #{updateTime},#{tenantId})
     </insert>
     <update id="update" parameterType="com.ym.mec.biz.dal.entity.InspectionItem">
         <!--@mbg.generated-->
@@ -84,7 +85,7 @@
                 update_time_ = #{updateTime},
             </if>
         </set>
-        where id_ = #{id}
+        where id_ = #{id} and tenant_id_ = #{tenantId}
     </update>
     <!-- 获取任务项数目及总次数 -->
     <select id="getItemCountAndTimes" resultMap="InspectionItem">
@@ -99,13 +100,13 @@
     <insert id="batchInsert" keyColumn="id_" keyProperty="id" parameterType="com.ym.mec.biz.dal.entity.InspectionItem"
             useGeneratedKeys="true">
         INSERT INTO inspection_item (inspection_id_, organ_id_, user_id_, item_, times_,operation_, create_time_,
-        update_time_)
+        update_time_,tenant_id_)
         VALUE
         <foreach collection="inspectionItems" item="inspectionItem" separator=",">
             (#{inspectionItem.inspectionId}, #{inspectionItem.organId}, #{inspectionItem.userId},
             #{inspectionItem.item,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}, #{inspectionItem.times},
             #{inspectionItem.operation},
-            #{inspectionItem.createTime}, #{inspectionItem.updateTime})
+            #{inspectionItem.createTime}, #{inspectionItem.updateTime},#{inspectionItem.tenantId})
         </foreach>
     </insert>
 
@@ -166,6 +167,7 @@
 
     <sql id="queryPageSql">
         <where>
+        	ii.tenant_id_ = #{tenantId}
             <if test="searchType != null and searchType != ''">
                 <if test="searchType == 'INSPECTION_ITEM'">
                     AND ii.times_ > planned_times_ AND ii.item_ = 'INSPECT' AND ii.memo_ ='' AND DATE_FORMAT(i.month_,'%Y-%m-%d') >= #{searchStartTime}

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

@@ -13,10 +13,11 @@
         <result column="create_time_" property="createTime"/>
         <result column="update_time_" property="updateTime"/>
         <result column="classInfo" property="classInfo"/>
+		<result column="tenant_id_" property="tenantId" />
     </resultMap>
     <sql id="Base_Column_List">
         <!--@mbg.generated-->
-        id_, plan_id_,course_schedule_id_, teacher_id_, check_item_, check_conclusion_, create_time_, update_time_
+        id_, plan_id_,course_schedule_id_, teacher_id_, check_item_, check_conclusion_, create_time_, update_time_, tenant_id_
     </sql>
     <select id="get" resultMap="InspectionItemPlanConclusion">
         <!--@mbg.generated-->
@@ -34,9 +35,9 @@
             parameterType="com.ym.mec.biz.dal.entity.InspectionItemPlanConclusion" useGeneratedKeys="true">
         <!--@mbg.generated-->
         insert into inspection_item_plan_conclusion (plan_id_,course_schedule_id_, teacher_id_,check_item_,
-        check_conclusion_, create_time_,update_time_)
+        check_conclusion_, create_time_,update_time_,tenant_id_)
         values (#{planId}, #{courseScheduleId},#{teacherId}, #{checkItem}, #{checkConclusion},#{createTime},
-        #{updateTime})
+        #{updateTime},#{tenantId})
     </insert>
     <update id="update" parameterType="com.ym.mec.biz.dal.entity.InspectionItemPlanConclusion">
         <!--@mbg.generated-->
@@ -64,7 +65,7 @@
                 update_time_ = #{updateTime},
             </if>
         </set>
-        where id_ = #{id}
+        where id_ = #{id} and tenant_id_ = #{tenantId}
     </update>
     <delete id="delByPlanIdAndCheckItem">
         DELETE
@@ -76,14 +77,14 @@
             parameterType="com.ym.mec.biz.dal.entity.InspectionItemPlanConclusion"
             useGeneratedKeys="true">
         INSERT INTO inspection_item_plan_conclusion (plan_id_,course_schedule_id_, teacher_id_, check_item_,
-        check_conclusion_,create_time_,update_time_)
+        check_conclusion_,create_time_,update_time_,tenant_id_)
         VALUE
         <foreach collection="inspectionItemPlanConclusions" item="inspectionItemPlanConclusion" separator=",">
             (#{inspectionItemPlanConclusion.planId},#{inspectionItemPlanConclusion.courseScheduleId},
             #{inspectionItemPlanConclusion.teacherId},
             #{inspectionItemPlanConclusion.checkItem},
             #{inspectionItemPlanConclusion.checkConclusion}, #{inspectionItemPlanConclusion.createTime},
-            #{inspectionItemPlanConclusion.updateTime})
+            #{inspectionItemPlanConclusion.updateTime},#{inspectionItemPlanConclusion.tenantId})
         </foreach>
     </insert>
 

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

@@ -26,6 +26,7 @@
         <result column="musicGroupName" property="musicGroupName"/>
         <result column="organName" property="organName"/>
         <result column="realName" property="realName"/>
+		<result column="tenant_id_" property="tenantId" />
     </resultMap>
     <select id="get" parameterType="java.lang.Long" resultMap="InspectionItemPlan">
         <!--@mbg.generated-->
@@ -43,10 +44,10 @@
         insert into inspection_item_plan (inspection_id_, item_id_, user_id_,operator_user_id_, plan_start_, plan_end_,
         organ_id_,cooperation_organ_id_,
         music_group_id_, school_gps_, submited_gps_, submited_time_, memo_, conclusion_status_, status_,
-        create_time_, update_time_)
+        create_time_, update_time_,tenant_id_)
         values (#{inspectionId}, #{itemId}, #{userId},#{operatorUserId}, #{planStart}, #{planEnd}, #{organId},#{cooperationOrganId},
         #{musicGroupId}, #{schoolGps}, #{submitedGps}, #{submitedTime}, #{memo},#{conclusionStatus},#{status},
-        #{createTime}, #{updateTime})
+        #{createTime}, #{updateTime},#{tenantId})
     </insert>
     <update id="update" parameterType="com.ym.mec.biz.dal.entity.InspectionItemPlan">
         <!--@mbg.generated-->
@@ -104,7 +105,7 @@
                 update_time_ = #{updateTime},
             </if>
         </set>
-        where id_ = #{id}
+        where id_ = #{id} and tenant_id_ = #{tenantId}
     </update>
 
     <!-- 分页查询 -->
@@ -129,6 +130,7 @@
 
     <sql id="queryPageSql">
         <where>
+        	tenant_id_ = #{tenantId}
             <if test="itemId != null">
                 AND iip.item_id_ = #{itemId}
             </if>

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

@@ -14,12 +14,13 @@
         <result column="update_time_" property="updateTime"/>
         <result column="organName" property="organName"/>
         <result column="userName" property="userName"/>
+		<result column="tenant_id_" property="tenantId" />
         <collection property="inspectionItems" columnPrefix="ie_" ofType="com.ym.mec.biz.dal.entity.InspectionItem"
                     resultMap="com.ym.mec.biz.dal.dao.InspectionItemDao.InspectionItem"/>
     </resultMap>
     <sql id="Base_Column_List">
         <!--@mbg.generated-->
-        id_, organ_id_, user_id_, month_, memo_, operation_, create_time_, update_time_
+        id_, organ_id_, user_id_, month_, memo_, operation_, create_time_, update_time_,tenant_id_
     </sql>
     <select id="get" parameterType="java.lang.Long" resultMap="Inspection">
         <!--@mbg.generated-->
@@ -35,8 +36,8 @@
     </delete>
     <insert id="insert" keyColumn="id_" keyProperty="id" parameterType="com.ym.mec.biz.dal.entity.Inspection"
             useGeneratedKeys="true">
-        insert into inspection (organ_id_, user_id_, month_, operation_, create_time_, update_time_)
-        values (#{organId}, #{userId}, #{month}, #{operation}, #{createTime}, #{updateTime})
+        insert into inspection (organ_id_, user_id_, month_, operation_, create_time_, update_time_,tenant_id_)
+        values (#{organId}, #{userId}, #{month}, #{operation}, #{createTime}, #{updateTime}, #{tenantId})
     </insert>
     <update id="update" parameterType="com.ym.mec.biz.dal.entity.Inspection">
         <!--@mbg.generated-->
@@ -64,7 +65,7 @@
                 update_time_ = #{updateTime},
             </if>
         </set>
-        where id_ = #{id}
+        where id_ = #{id} and tenant_id_ = #{tenantId}
     </update>
 
     <!-- 分页查询 -->
@@ -85,6 +86,7 @@
 
     <sql id="queryPageSql">
         <where>
+        	tenant_id_ = #{tenantId}
             <if test="organId != null">
                 AND FIND_IN_SET(i.organ_id_,#{organId})
             </if>

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

@@ -8,9 +8,10 @@
     <result column="available_amount_" property="availableAmount" jdbcType="BIGINT" />
     <result column="modify_on_" property="modifyOn" jdbcType="TIMESTAMP" />
     <result column="group_id_" property="groupId"/>
+		<result column="tenant_id_" property="tenantId" />
   </resultMap>
   <sql id="Base_Column_List" >
-    user_id_, used_count_, available_count_, available_amount_, modify_on_,group_id_
+    user_id_, used_count_, available_count_, available_amount_, modify_on_,group_id_,tenant_id_
   </sql>
   
   <select id="get" resultMap="BaseResultMap" parameterType="java.lang.Long" >
@@ -28,7 +29,7 @@
   </select>
   
   <select id="findAll" resultMap="BaseResultMap">
-    select * from luck_draw_count
+    select * from luck_draw_count where tenant_id_ = #{tenantId}
   </select>
   <select id="findByIdAndGroupId" resultMap="BaseResultMap">
     SELECT * FROM luck_draw_count WHERE user_id_ = #{userId} AND group_id_ = #{groupId}
@@ -44,9 +45,9 @@
   
   <insert id="insert" parameterType="com.ym.mec.biz.dal.entity.LuckDrawCount" >
     insert into luck_draw_count (user_id_, used_count_, available_count_, available_amount_,
-      modify_on_,group_id_)
+      modify_on_,group_id_,tenant_id_)
     values (#{userId}, #{usedCount}, #{availableCount}, #{availableAmount},
-      NOW(),#{groupId})
+      NOW(),#{groupId},#{tenantId})
   </insert>
   
   <update id="update" parameterType="com.ym.mec.biz.dal.entity.LuckDrawCount" >
@@ -68,6 +69,6 @@
         modify_on_ = #{modifyOn,jdbcType=TIMESTAMP},
       </if>
     </set>
-    where user_id_ = #{userId,jdbcType=BIGINT}
+    where user_id_ = #{userId,jdbcType=BIGINT} and tenant_id_ = #{tenantId}
   </update>
 </mapper>

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

@@ -9,10 +9,11 @@
     <result column="start_time_" property="startTime" jdbcType="TIMESTAMP" />
     <result column="end_time_" property="endTime" jdbcType="TIMESTAMP" />
     <result column="create_on_" property="createOn" jdbcType="TIMESTAMP" />
+		<result column="tenant_id_" property="tenantId" />
   </resultMap>
   
   <sql id="Base_Column_List" >
-    id_, name_, consume_type_, consume_value_, start_time_, end_time_, create_on_
+    id_, name_, consume_type_, consume_value_, start_time_, end_time_, create_on_, tenant_id_
   </sql>
   
   <select id="get" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
@@ -23,7 +24,7 @@
   </select>
   
   <select id="findAll" resultMap="BaseResultMap" parameterType="map" >
-    select * from luck_draw_group
+    select * from luck_draw_group where tenant_id_ = #{tenantId}
   </select>
   
   <delete id="delete" parameterType="java.lang.Integer" >
@@ -33,10 +34,10 @@
   
   <insert id="insert" parameterType="com.ym.mec.biz.dal.entity.LuckDrawGroup" >
     insert into luck_draw_group (id_, name_, consume_type_, consume_value_,
-      start_time_, end_time_, create_on_
+      start_time_, end_time_, create_on_, tenant_id_
       )
     values (#{id,jdbcType=INTEGER}, #{name,jdbcType=VARCHAR}, #{consumeType,jdbcType=VARCHAR}, #{consumeValue,jdbcType=INTEGER},
-      #{startTime,jdbcType=TIMESTAMP}, #{endTime,jdbcType=TIMESTAMP}, #{createOn,jdbcType=TIMESTAMP}
+      #{startTime,jdbcType=TIMESTAMP}, #{endTime,jdbcType=TIMESTAMP}, #{createOn,jdbcType=TIMESTAMP}, #{tenantId}
       )
   </insert>
 
@@ -62,12 +63,13 @@
         create_on_ = #{createOn,jdbcType=TIMESTAMP},
       </if>
     </set>
-    where id_ = #{id,jdbcType=INTEGER}
+    where id_ = #{id,jdbcType=INTEGER} and tenant_id_ = #{tenantId}
   </update>
 
 	<select id="queryCount" parameterType="map" resultType="int">
 		select count(*) from luck_draw_group
 		<where>
+			tenant_id_ = #{tenantId}
 			<if test="search != null">
 				and name_ like concat('%',#{search},'%')
 			</if>
@@ -77,6 +79,7 @@
 	<select id="queryPage" parameterType="map" resultMap="BaseResultMap">
 		select * from luck_draw_group
 		<where>
+			tenant_id_ = #{tenantId}
 			<if test="search != null">
 				and name_ like concat('%',#{search},'%')
 			</if>

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

@@ -9,6 +9,7 @@
 		<result column="create_on_" property="createOn" jdbcType="TIMESTAMP" />
 		<result column="name_" property="luckDrawPrize.name" jdbcType="VARCHAR" />
 		<result column="reward_type_" property="luckDrawPrize.rewardType" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler" />
+		<result column="tenant_id_" property="tenantId" />
 	</resultMap>
 	
 	<resultMap id="BaseResultMapExt" type="com.ym.mec.biz.dal.entity.LuckDrawLog" extends="BaseResultMap">
@@ -18,7 +19,7 @@
 	</resultMap>
 
 	<sql id="Base_Column_List">
-		l.id_,l.group_id_, l.prize_id_,d.name_,d.reward_type_, l.user_id_, l.create_on_
+		l.id_,l.group_id_, l.prize_id_,d.name_,d.reward_type_, l.user_id_, l.create_on_,l.tenant_id_
 	</sql>
 
 	<select id="get" resultMap="BaseResultMap" parameterType="java.lang.Long">
@@ -38,11 +39,11 @@
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.LuckDrawLog">
 		insert into
 		luck_draw_log (id_,group_id_, prize_id_, user_id_,
-		create_on_)
+		create_on_,tenant_id_)
 		values
 		(#{id,jdbcType=BIGINT}, #{groupId,jdbcType=INTEGER}, #{prizeId,jdbcType=INTEGER},
 		#{userId,jdbcType=BIGINT},
-		#{createOn,jdbcType=TIMESTAMP})
+		#{createOn,jdbcType=TIMESTAMP},#{tenantId})
 	</insert>
 
 	<update id="update" parameterType="com.ym.mec.biz.dal.entity.LuckDrawLog">
@@ -61,7 +62,7 @@
 				create_on_ = #{createOn,jdbcType=TIMESTAMP},
 			</if>
 		</set>
-		where id_ = #{id,jdbcType=BIGINT}
+		where id_ = #{id,jdbcType=BIGINT} and tenant_id_ = #{tenantId}
 	</update>
 
 	<select id="queryCount" parameterType="map" resultType="int">
@@ -91,6 +92,7 @@
 
     <sql id="queryCondition">
 		<where>
+			l.tenant_id_ = #{tenantId}
 			<if test="prizeId != null">
 				AND l.prize_id_ = #{id}
 			</if>

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

@@ -13,14 +13,16 @@
 		<result column="is_default_" property="isDefault" />
 		<result column="create_on_" property="createOn" jdbcType="TIMESTAMP" />
 		<result column="modify_on_" property="modifyOn" jdbcType="TIMESTAMP" />
+		<result column="tenant_id_" property="tenantId" />
 	</resultMap>
 
 	<sql id="Base_Column_List">
-		id_, name_, chances_, stock_, enabled_, reward_type_, memo_, group_id_, is_default_, create_on_, modify_on_
+		id_, name_, chances_, stock_, enabled_, reward_type_, memo_, group_id_, is_default_, create_on_, modify_on_, tenant_id_
 	</sql>
 
 	<sql id="queryCondition">
 		<where>
+			tenant_id_ = #{tenantId}
 			<if test="enabled != null">
 				and enabled_ = #{enabled}
 			</if>
@@ -68,23 +70,23 @@
             keyProperty="id">
 		insert into luck_draw_prize (id_, name_, chances_,
 		stock_, enabled_, reward_type_, memo_, group_id_, is_default_, create_on_,
-		modify_on_)
+		modify_on_,tenant_id_)
 		values (#{id,jdbcType=INTEGER}, #{name,jdbcType=VARCHAR},
 		#{chances,jdbcType=DOUBLE},
 		#{stock,jdbcType=INTEGER}, #{enabled,jdbcType=BIT},#{rewardType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}, #{memo,jdbcType=VARCHAR}, #{groupId,jdbcType=INTEGER}, #(isDefault), #{createOn,jdbcType=TIMESTAMP},
-		#{modifyOn,jdbcType=TIMESTAMP})
+		#{modifyOn,jdbcType=TIMESTAMP},#{tenantId})
 	</insert>
 
 	<insert id="batchInsert" parameterType="java.util.List" useGeneratedKeys="true" keyColumn="id"
             keyProperty="id">
 		insert into luck_draw_prize (id_, name_, chances_,
 		stock_, enabled_, reward_type_, memo_, group_id_, is_default_, create_on_,
-		modify_on_) values 
+		modify_on_,tenant_id_) values 
 		<foreach collection="list" item="item" separator=",">
 		(#{item.id,jdbcType=INTEGER}, #{item.name,jdbcType=VARCHAR},
 		#{item.chances,jdbcType=DOUBLE}, #{item.stock,jdbcType=INTEGER}, 
 		#{item.enabled,jdbcType=BIT},#{item.rewardType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-		#{item.memo,jdbcType=VARCHAR}, #{item.groupId,jdbcType=INTEGER}, #{item.isDefault}, now(), now())
+		#{item.memo,jdbcType=VARCHAR}, #{item.groupId,jdbcType=INTEGER}, #{item.isDefault}, now(), now(),#{tenantId})
 		</foreach>
 	</insert>
 
@@ -122,7 +124,7 @@
 				modify_on_ = #{modifyOn,jdbcType=TIMESTAMP},
 			</if>
 		</set>
-		where id_ = #{id,jdbcType=INTEGER}
+		where id_ = #{id,jdbcType=INTEGER} and tenant_id_ = #{tenantId}
 	</update>
 	<update id="batchUpdate">
 		<foreach collection="updateDraw" item="draw" separator=";">
@@ -154,7 +156,7 @@
 				</if>
 				modify_on_ = NOW()
 			</set>
-			WHERE id_ = #{draw.id,jdbcType=INTEGER}
+			WHERE id_ = #{draw.id,jdbcType=INTEGER} and tenant_id_ = #{draw.tenantId}
 		</foreach>
 	</update>
 

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

@@ -12,6 +12,7 @@
         <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="get" parameterType="java.lang.Integer" resultMap="ManagerDownload">
@@ -28,10 +29,10 @@
             useGeneratedKeys="true">
         <!--@mbg.generated-->
         insert into manager_download (user_id_, name_, file_url_,type_,
-        status_, create_time_, update_time_
+        status_, create_time_, update_time_,tenant_id_
         )
         values (#{userId}, #{name}, #{fileUrl},#{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-        #{status}, #{createTime}, #{updateTime}
+        #{status}, #{createTime}, #{updateTime},#{tenantId}
         )
     </insert>
 
@@ -54,7 +55,7 @@
             create_time_ = NOW(),
             update_time_ = NOW(),
         </set>
-        where id_ = #{id}
+        where id_ = #{id} and tenant_id_ = #{tenantId}
     </update>
 
     <!-- 分页查询 -->
@@ -73,6 +74,7 @@
 
     <sql id="queryPageSql">
         <where>
+        	tenant_id_ = #{tenantId}
             <if test="userId != null">
                 AND user_id_ = #{userId}
             </if>

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

@@ -12,6 +12,7 @@
 		<result column="activity_ids_" property="activityIds" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
+		<result column="tenant_id_" property="tenantId" />
 	</resultMap>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -21,13 +22,13 @@
 	
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="MarketActivity">
-		SELECT * FROM market_activity ORDER BY id_
+		SELECT * FROM market_activity where tenant_id_ = #{tenantId} ORDER BY id_
 	</select>
 	
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.MarketActivity" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		INSERT INTO market_activity (name_,activity_ids_,create_time_,update_time_)
-		VALUES(#{name},#{activityIds},#{createTime},#{updateTime})
+		INSERT INTO market_activity (name_,activity_ids_,create_time_,update_time_,tenant_id_)
+		VALUES(#{name},#{activityIds},#{createTime},#{updateTime},#{tenantId})
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -40,7 +41,7 @@
 		activity_ids_ = #{activityIds},
 		</if>
 		update_time_ = NOW()
-	</set> WHERE id_ = #{id}
+	</set> WHERE id_ = #{id} and tenant_id_ = #{tenantId}
 	</update>
 	
 	<!-- 根据主键删除一条记录 -->
@@ -49,7 +50,7 @@
 	</delete>
 	<sql id="queryPageSql">
 		<where>
-			1=1
+			tenant_id_ = #{tenantId}
 			<if test="search != null and search != ''">
 				AND (name_ LIKE CONCAT('%',#{search},'%') OR id_ = #{search} OR FIND_IN_SET(#{search},activity_ids_))
 			</if>

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

@@ -21,6 +21,7 @@
 		<result column="current_year_fee_" property="currentYearFee" />
 		<result column="group_purchase_year_fee_" property="groupPurchaseYearFee" />
 		<result column="original_year_fee_" property="originalYearFee" />
+		<result column="tenant_id_" property="tenantId" />
 	</resultMap>
 
 	<!-- 根据主键查询一条记录 -->
@@ -31,7 +32,7 @@
 
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="MemberFeeSetting">
-		SELECT * FROM member_fee_setting
+		SELECT * FROM member_fee_setting where tenant_id_ = #{tenantId}
 		ORDER BY id_
 	</select>
 
@@ -41,8 +42,8 @@
 		<!-- <selectKey resultClass="int" keyProperty="id" > SELECT SEQ_WSDEFINITION_ID.nextval 
 			AS ID FROM DUAL </selectKey> -->
 		INSERT INTO member_fee_setting
-		(id_,current_day_fee_,group_purchase_day_fee_,original_day_fee_,current_month_fee_,group_purchase_month_fee_,original_month_fee_,current_quarterly_fee_,group_purchase_quarterly_fee_,original_quarterly_fee_,current_half_year_fee_,group_purchase_half_year_fee_,original_half_year_fee_,current_year_fee_,group_purchase_year_fee_,original_year_fee_)
-		VALUES(#{id},#{currentDayFee},#{groupPurchaseDayFee},#{originalDayFee},#{currentMonthFee},#{groupPurchaseMonthFee},#{originalMonthFee},#{currentQuarterlyFee},#{groupPurchaseQuarterlyFee},#{originalQuarterlyFee},#{currentHalfYearFee},#{groupPurchaseHalfYearFee},#{originalHalfYearFee},#{currentYearFee},#{groupPurchaseYearFee},#{originalYearFee})
+		(id_,current_day_fee_,group_purchase_day_fee_,original_day_fee_,current_month_fee_,group_purchase_month_fee_,original_month_fee_,current_quarterly_fee_,group_purchase_quarterly_fee_,original_quarterly_fee_,current_half_year_fee_,group_purchase_half_year_fee_,original_half_year_fee_,current_year_fee_,group_purchase_year_fee_,original_year_fee_,tenant_id_)
+		VALUES(#{id},#{currentDayFee},#{groupPurchaseDayFee},#{originalDayFee},#{currentMonthFee},#{groupPurchaseMonthFee},#{originalMonthFee},#{currentQuarterlyFee},#{groupPurchaseQuarterlyFee},#{originalQuarterlyFee},#{currentHalfYearFee},#{groupPurchaseHalfYearFee},#{originalHalfYearFee},#{currentYearFee},#{groupPurchaseYearFee},#{originalYearFee},#{tenantId})
 	</insert>
 
 	<!-- 根据主键查询一条记录 -->
@@ -68,20 +69,20 @@
 				original_month_fee_ = #{originalMonthFee},
 				original_year_fee_ = #{originalYearFee}
 		</set>
-		WHERE id_ = #{id}
+		WHERE id_ = #{id} and tenant_id_ = #{tenantId}
 	</update>
 
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="MemberFeeSetting"
 		parameterType="map">
-		SELECT * FROM member_fee_setting ORDER BY id_
+		SELECT * FROM member_fee_setting where tenant_id_ = #{tenantId} ORDER BY id_
 		<include refid="global.limit" />
 	</select>
 
 	<!-- 查询当前表的总记录数 -->
 	<select id="queryCount" resultType="int">
 		SELECT COUNT(*) FROM
-		member_fee_setting
+		member_fee_setting where tenant_id_ = #{tenantId}
 	</select>
 	
 	<select id="findByRankIdAndOrganId" resultMap="MemberFeeSetting">

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

@@ -17,6 +17,7 @@
 		<result column="update_time_" property="updateTime" />
 		<result column="rank_name_" property="rankName" />
 		<result column="organ_name_" property="organName" />
+		<result column="tenant_id_" property="tenantId" />
 		<association property="memberFeeSetting" javaType="com.ym.mec.biz.dal.entity.MemberFeeSetting">
 			<result property="id" column="member_fee_setting_id_"/>
 			<result column="current_day_fee_" property="currentDayFee" />
@@ -47,13 +48,13 @@
 	
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="MemberRankOrganizationFeeMapper">
-		SELECT mrofm.* FROM member_rank_organization_fee_mapper mrofm
+		SELECT mrofm.* FROM member_rank_organization_fee_mapper mrofm where tenant_id_ = #{tenantId}
 	</select>
 	
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.MemberRankOrganizationFeeMapper" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		INSERT INTO member_rank_organization_fee_mapper (organ_id_,member_rank_setting_id_,member_fee_setting_id_,operator_id_,create_time_,update_time_)
-		VALUES(#{organId},#{memberRankSettingId},#{memberFeeSettingId},#{operatorId},NOW(),NOW())
+		INSERT INTO member_rank_organization_fee_mapper (organ_id_,member_rank_setting_id_,member_fee_setting_id_,operator_id_,create_time_,update_time_,tenant_id_)
+		VALUES(#{organId},#{memberRankSettingId},#{memberFeeSettingId},#{operatorId},NOW(),NOW(),#{tenantId})
 	</insert>
 
 	<update id="update" parameterType="com.ym.mec.biz.dal.entity.MemberRankOrganizationFeeMapper">
@@ -71,7 +72,7 @@
 			operator_id_ = #{operatorId},
 		</if>
 		update_time_ = NOW()
-	</set> WHERE id_ = #{id}
+	</set> WHERE id_ = #{id} and tenant_id_ = #{tenantId}
 	</update>
 	
 	<!-- 分页查询 -->
@@ -83,6 +84,7 @@
 		LEFT JOIN organization o ON o.id_ = mrofm.organ_id_
 		LEFT JOIN sys_user su ON su.id_ = mrofm.operator_id_
 		<where>
+			tenant_id_ = #{tenantId}
 			<if test="search != null and search != ''">
 				AND mrs.name_ LIKE CONCAT('%',#{search},'%')
 			</if>
@@ -99,6 +101,7 @@
 		SELECT COUNT(mrofm.id_) FROM member_rank_organization_fee_mapper mrofm
 		LEFT JOIN member_rank_setting mrs ON  mrofm.member_rank_setting_id_ = mrs.id_
 		<where>
+			tenant_id_ = #{tenantId}
 			<if test="search != null and search != ''">
 				AND mrs.name_ LIKE CONCAT('%',#{search},'%')
 			</if>

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

@@ -23,6 +23,7 @@
 		<result column="remark_" property="remark" />
 		<result column="create_time_" property="createTime"/>
 		<result column="update_time_" property="updateTime"/>
+		<result column="tenant_id_" property="tenantId" />
 	</resultMap>
 
 	<!-- 根据主键查询一条记录 -->
@@ -32,7 +33,7 @@
 
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="MusicEnlightenmentQuestionnaire">
-		SELECT * FROM music_enlightenment_questionnaire ORDER BY id_
+		SELECT * FROM music_enlightenment_questionnaire where tenant_id_ = #{tenantId} ORDER BY id_
 	</select>
 
 	<!-- 向数据库增加一条记录 -->
@@ -42,8 +43,8 @@
 		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
 		</selectKey>
 		-->
-		INSERT INTO music_enlightenment_questionnaire (music_group_id_,user_id_,user_name_,phone_,current_grade_,current_grade_num_,current_class_,teacher_recommand_subject_id_,musical_instruments_learning_,musical_instruments_name_,join_parent_meeting_,remark_,create_time_,update_time_)
-		VALUES(#{musicGroupId},#{userId},#{userName},#{phone},#{currentGrade},#{currentGradeNum},#{currentClass},#{teacherRecommandSubjectId},#{musicalInstrumentsLearning},#{musicalInstrumentsName},#{joinParentMeeting},#{remark},NOW(),NOW())
+		INSERT INTO music_enlightenment_questionnaire (music_group_id_,user_id_,user_name_,phone_,current_grade_,current_grade_num_,current_class_,teacher_recommand_subject_id_,musical_instruments_learning_,musical_instruments_name_,join_parent_meeting_,remark_,create_time_,update_time_,tenant_id_)
+		VALUES(#{musicGroupId},#{userId},#{userName},#{phone},#{currentGrade},#{currentGradeNum},#{currentClass},#{teacherRecommandSubjectId},#{musicalInstrumentsLearning},#{musicalInstrumentsName},#{joinParentMeeting},#{remark},NOW(),NOW(),#{tenantId})
 	</insert>
 
 	<!-- 根据主键查询一条记录 -->
@@ -86,7 +87,7 @@
 			</if>
 			update_time_ = NOW()
 		</set>
-		WHERE id_ = #{id}
+		WHERE id_ = #{id} and tenant_id_ = #{tenantId}
 	</update>
 
 	<!-- 根据主键删除一条记录 -->
@@ -96,6 +97,7 @@
 
 	<sql id="queryCondition">
 		<where>
+			tenant_id_ = #{tenantId}
 			<if test="musicGroupId!=null and musicGroupId!=''">
 				AND meq.music_group_id_=#{musicGroupId}
 			</if>