update

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

@@ -75,7 +75,7 @@ public interface EmployeeDao extends BaseDAO<Integer, Employee> {
      * @param id
      * @param roleIds
      */
-    void batchAddEmployeeRole(@Param("userId") Integer id, @Param("roleIds") List<Integer> roleIds);
+    void batchAddEmployeeRole(@Param("userId") Integer id, @Param("roleIds") List<Integer> roleIds, @Param("tenantId") Integer tenantId);
 
     /**
      * 获取用户权限列表
@@ -208,7 +208,7 @@ public interface EmployeeDao extends BaseDAO<Integer, Employee> {
      * @param roleId 角色id
      * @param menuIds 菜单集合
      */
-    int batchInsertRoleMenu(@Param("roleId") Integer roleId,@Param("menuIds")  List<Integer> menuIds);
+    int batchInsertRoleMenu(@Param("roleId") Integer roleId,@Param("menuIds")  List<Integer> menuIds, @Param("tenantId") Integer tenantId);
 
     /**
      * 添加角色信息

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

@@ -69,17 +69,6 @@ public interface ExtracurricularExercisesReplyDao extends BaseDAO<Long, Extracur
     int countExtraExercises(Map<String, Object> params);
 
     /**
-     * @describe 获取在指定星期内无网管课学员的课外训练
-     * @author Joburgess
-     * @date 2020/4/10
-     * @param monday:
-     * @param sunday:
-     * @return java.util.List<com.ym.mec.biz.dal.entity.ExtracurricularExercisesReply>
-     */
-    List<ExtracurricularExercisesReply> findNoPracticeStudentExercisesInWeek(@Param("monday") String monday,
-                                                                             @Param("sunday") String sunday);
-
-    /**
      * @describe 获取学员再指定时间段内的课程作业和课外训练
      * @author Joburgess
      * @date 2020.04.29
@@ -88,7 +77,7 @@ public interface ExtracurricularExercisesReplyDao extends BaseDAO<Long, Extracur
      * @return java.util.List<com.ym.mec.biz.dal.dto.StudentServiceHomeworkDto>
      */
     List<StudentServiceHomeworkDto> findStudentHomewarksInWeek(@Param("monday") String monday,
-                                                               @Param("sunday") String sunday);
+                                                               @Param("sunday") String sunday, @Param("tenantId") Integer tenantId);
 
     /**
      * @describe 获取学生在指定时间段内的作业详情
@@ -111,7 +100,7 @@ public interface ExtracurricularExercisesReplyDao extends BaseDAO<Long, Extracur
      */
 	List<ExtracurricularExercisesReply> getStudentExercisesWithTimeZone(@Param("startDate") String startDate,
                                                                         @Param("endDate") String endDate,
-                                                                        @Param("studentIds") List<Integer> studentIds);
+                                                                        @Param("studentIds") List<Integer> studentIds,@Param("tenantId") Integer tenantId);
 
     /**
      * @describe
@@ -139,7 +128,7 @@ public interface ExtracurricularExercisesReplyDao extends BaseDAO<Long, Extracur
 
     List<EduHomeworkCardDto> countEduHomeworkStudentNumWithMusicGroup(@Param("groupIds") List<String> groupIds,
                                                                       @Param("startTime") Date startTime,
-                                                                      @Param("endTime") Date endTime);
+                                                                      @Param("endTime") Date endTime,@Param("tenantId") Integer tenantId);
 
     List<EduHomeworkCardDto> countEduHomeworkSubjectStudentNumWithMusicGroup(@Param("groupId") String groupId,
                                                                              @Param("startTime") Date startTime,

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

@@ -25,7 +25,7 @@ public interface FinancialExpenditureDao extends BaseDAO<Long, FinancialExpendit
      *
      * @return
      */
-    List<FinancialExpenditure> getCooperationExpenditure(@Param("startTime") Date startTime, @Param("endTime") Date endTime);
+    List<FinancialExpenditure> getCooperationExpenditure(@Param("startTime") Date startTime, @Param("endTime") Date endTime, @Param("tenantId") Integer tenantId);
 
     /**
      * @param collect:

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

@@ -98,7 +98,7 @@ public interface EmployeeService extends BaseService<Integer, Employee> {
 
     List<Integer> queryUserRole(Integer sysUserId);
 
-    int batchInsertRoleMenu( Integer roleId, List<Integer> menuIds);
+    int batchInsertRoleMenu( Integer roleId, List<Integer> menuIds, Integer tenantId);
 
     int insertSysRole(SysRole sysRole);
 

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

@@ -30,6 +30,7 @@ import com.ym.mec.im.ImFeignService;
 import com.ym.mec.im.entity.GroupMember;
 import com.ym.mec.im.entity.GroupModel;
 import com.ym.mec.util.collection.MapUtil;
+
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
@@ -87,7 +88,7 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee>  imp
 				employee.setId(user.getId());
 				employeeDao.insert(employee);
 				//新增用户角色
-				employeeDao.batchAddEmployeeRole(user.getId(),employee.getRoleIds());
+				employeeDao.batchAddEmployeeRole(user.getId(),employee.getRoleIds(), user.getTeacherId());
 				employee.setUserType(user.getUserType() + ",SYSTEM");
 				teacherDao.updateUser(employee);
 				return;
@@ -101,7 +102,7 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee>  imp
 		employee.setUserId(employee.getId());
         employeeDao.insert(employee);
 		//新增用户角色
-		employeeDao.batchAddEmployeeRole(employee.getId(),employee.getRoleIds());
+		employeeDao.batchAddEmployeeRole(employee.getId(),employee.getRoleIds(), user.getTeacherId());
 		//添加用户现金账户
 		sysUserCashAccountDao.insert(new SysUserCashAccount(employee.getId(),"CNY"));
 		ImResult imResult = imFeignService.register(new ImUserModel(employee.getId().toString(), employee.getUsername(),null));
@@ -136,7 +137,7 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee>  imp
 		//删除当前用户角色
 		employeeDao.delEmployeeRole(employee.getId());
 		//新增用户角色
-		employeeDao.batchAddEmployeeRole(employee.getId(),employee.getRoleIds());
+		employeeDao.batchAddEmployeeRole(employee.getId(),employee.getRoleIds(), sysUser.getTeacherId());
 		teacherDao.updateUser(employee);
 		imGroupDao.updateNickname(employee.getUserId(), employee.getRealName());
 		imGroupDao.updateUserFriendNickname(employee.getUserId(), employee.getRealName());
@@ -411,8 +412,8 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee>  imp
      * @param menuIds 菜单集合
      */
     @Override
-    public int batchInsertRoleMenu(Integer roleId, List<Integer> menuIds) {
-        return employeeDao.batchInsertRoleMenu(roleId, menuIds);
+    public int batchInsertRoleMenu(Integer roleId, List<Integer> menuIds, Integer tenantId) {
+        return employeeDao.batchInsertRoleMenu(roleId, menuIds, tenantId);
     }
 
     /**

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

@@ -17,9 +17,11 @@ import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
+import com.ym.mec.common.tenant.TenantContextHolder;
 import com.ym.mec.thirdparty.message.MessageSenderPluginContext;
 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;
@@ -267,7 +269,7 @@ public class ExtracurricularExercisesReplyServiceImpl extends BaseServiceImpl<Lo
 			return;
 		}
 
-		List<StudentServiceHomeworkDto> studentHomeworksInWeek = extracurricularExercisesReplyDao.findStudentHomewarksInWeek(monDayDate.toString(), sunDayDate.toString());
+		List<StudentServiceHomeworkDto> studentHomeworksInWeek = extracurricularExercisesReplyDao.findStudentHomewarksInWeek(monDayDate.toString(), sunDayDate.toString(), TenantContextHolder.getTenantId());
 		Map<Integer, List<StudentServiceHomeworkDto>> studentExercisesMap = studentHomeworksInWeek.stream().collect(Collectors.groupingBy(StudentServiceHomeworkDto::getUserId));
 
 		List<StudentExtracurricularExercisesSituation> results=new ArrayList<>();

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

@@ -89,7 +89,7 @@ public class OperatingReportServiceImpl extends BaseServiceImpl<Integer, Operati
         }
 
         //2、获取支出费用
-        List<FinancialExpenditure> cooperationExpenditures = financialExpenditureDao.getCooperationExpenditure(startTime, endTime);
+        List<FinancialExpenditure> cooperationExpenditures = financialExpenditureDao.getCooperationExpenditure(startTime, endTime, tenantId);
         for (FinancialExpenditure cooperationExpenditure : cooperationExpenditures) {
             OperatingReport organOperatingReport = new OperatingReport();
             if (organOperating.containsKey(cooperationExpenditure.getOrganId())) {

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

@@ -542,7 +542,7 @@ public class StudentCourseHomeworkServiceImpl extends BaseServiceImpl<Long, Stud
             BigDecimal zero = new BigDecimal("0.00");
 
             List<EduHomeworkCardDto> courseHomeworkStudentNumList = studentCourseHomeworkDao.countHomeworkStudentInfoWithMusicGroup(groupIds, queryInfo.getStartTime(), queryInfo.getEndTime());
-            List<EduHomeworkCardDto> homeworkStudentNumList = extracurricularExercisesReplyDao.countEduHomeworkStudentNumWithMusicGroup(groupIds, queryInfo.getStartTime(), queryInfo.getEndTime());
+            List<EduHomeworkCardDto> homeworkStudentNumList = extracurricularExercisesReplyDao.countEduHomeworkStudentNumWithMusicGroup(groupIds, queryInfo.getStartTime(), queryInfo.getEndTime(), queryInfo.getTenantId());
             homeworkStudentNumList.addAll(courseHomeworkStudentNumList);
             Map<String, List<EduHomeworkCardDto>> groupStudentListMap = homeworkStudentNumList.stream().collect(Collectors.groupingBy(EduHomeworkCardDto::getGroupId));
             for (MusicGroup mg : musicGroups) {

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

@@ -8,7 +8,9 @@ import com.ym.mec.biz.dal.enums.*;
 import com.ym.mec.biz.service.StudentServeService;
 import com.ym.mec.biz.service.SysConfigService;
 import com.ym.mec.common.exception.BizException;
+import com.ym.mec.common.tenant.TenantContextHolder;
 import com.ym.mec.util.date.DateUtil;
+
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -181,7 +183,7 @@ public class StudentServeServiceImpl implements StudentServeService {
             }
 
             if(!CollectionUtils.isEmpty(allServeStudentIds)){
-                List<ExtracurricularExercisesReply> studentExercises = extracurricularExercisesReplyDao.getStudentExercisesWithTimeZone(monDayDate.toString(), sunDayDate.toString(), new ArrayList<>(allServeStudentIds));
+                List<ExtracurricularExercisesReply> studentExercises = extracurricularExercisesReplyDao.getStudentExercisesWithTimeZone(monDayDate.toString(), sunDayDate.toString(), new ArrayList<>(allServeStudentIds), TenantContextHolder.getTenantId());
                 studentExercisesMap = studentExercises.stream().collect(Collectors.groupingBy(ExtracurricularExercisesReply::getUserId));
             }
 
@@ -625,7 +627,7 @@ public class StudentServeServiceImpl implements StudentServeService {
             }
 
 
-            List<ExtracurricularExercisesReply> allStudentExercises = extracurricularExercisesReplyDao.getStudentExercisesWithTimeZone(monDayDate.toString(), sunDayDate.toString(), new ArrayList<>(allStudentIds));
+            List<ExtracurricularExercisesReply> allStudentExercises = extracurricularExercisesReplyDao.getStudentExercisesWithTimeZone(monDayDate.toString(), sunDayDate.toString(), new ArrayList<>(allStudentIds), TenantContextHolder.getTenantId());
             if(!CollectionUtils.isEmpty(allStudentExercises)){
                 studentExercisesMap = allStudentExercises.stream().collect(Collectors.groupingBy(ExtracurricularExercisesReply::getUserId));
             }
@@ -812,7 +814,7 @@ public class StudentServeServiceImpl implements StudentServeService {
         }
 
 
-        List<ExtracurricularExercisesReply> allStudentExercises = extracurricularExercisesReplyDao.getStudentExercisesWithTimeZone(monDayDate.toString(), sunDayDate.toString(), new ArrayList<>(studentIds));
+        List<ExtracurricularExercisesReply> allStudentExercises = extracurricularExercisesReplyDao.getStudentExercisesWithTimeZone(monDayDate.toString(), sunDayDate.toString(), new ArrayList<>(studentIds), TenantContextHolder.getTenantId());
         if(!CollectionUtils.isEmpty(allStudentExercises)){
             studentExercisesMap = allStudentExercises.stream().collect(Collectors.groupingBy(ExtracurricularExercisesReply::getUserId));
         }

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

@@ -271,7 +271,7 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoDao, TenantInfo
         //建立角色
         Integer roleId = createRole(tenantInfo);
         //建立角色和菜单关系数据
-        employeeService.batchInsertRoleMenu(roleId, collectMenuId);
+        employeeService.batchInsertRoleMenu(roleId, collectMenuId, tenantId);
         // 创建账号、用户信息、用户和角色关系
         createUser(tenantInfo, Lists.newArrayList(roleId));
     }

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

@@ -29,6 +29,7 @@
         <result column="activity_tag_" property="activityTag"/>
         <result column="degree_type_" property="degreeType"/>
         <result column="certificate_type_" property="certificateType"/>
+		<result column="tenant_id_" property="tenantId" />
     </resultMap>
 
     <select id="get" parameterType="java.lang.Integer" resultMap="DegreeRegistration">
@@ -40,12 +41,13 @@
     <!-- 全查询 -->
     <select id="findAll" resultMap="DegreeRegistration">
         SELECT *
-        FROM degree_registration
+        FROM degree_registration where tenant_id_ = #{tenantId}
         ORDER BY id_
     </select>
 
     <sql id="queryPageSql">
         <where>
+            tenant_id_ =  #{tenantId}
             <if test="organId != null">
                 AND FIND_IN_SET(organ_id_,#{organId})
             </if>
@@ -138,13 +140,13 @@
         idcard_, city_, school_,
         subject_,level_, theory_level_,theory_money_, theory_cert_,mobile_,
         money_, memo_, create_time_,
-        update_time_, status_, activity_tag_,degree_type_,certificate_type_)
+        update_time_, status_, activity_tag_,degree_type_,certificate_type_,tenant_id_)
         values (#{userId},#{sporadicId,jdbcType=INTEGER},#{organId,jdbcType=INTEGER}, #{orderNo,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{gender,jdbcType=VARCHAR},
         #{idcard,jdbcType=VARCHAR}, #{city,jdbcType=VARCHAR}, #{school,jdbcType=VARCHAR},
         #{subject,jdbcType=VARCHAR},#{level,jdbcType=VARCHAR},
         #{theoryLevel,jdbcType=VARCHAR},#{theoryMoney,jdbcType=DECIMAL},
         #{theoryCert,jdbcType=VARCHAR},#{mobile,jdbcType=VARCHAR},#{money,jdbcType=DECIMAL}, #{memo,jdbcType=VARCHAR},
-        #{createTime}, #{updateTime}, #{status,jdbcType=TINYINT}, #{activityTag}, #{degreeType},#{certificateType})
+        #{createTime}, #{updateTime}, #{status,jdbcType=TINYINT}, #{activityTag}, #{degreeType},#{certificateType},#{tenantId})
     </insert>
     <update id="update" parameterType="com.ym.mec.biz.dal.entity.DegreeRegistration">
         <!--@mbg.generated-->
@@ -221,7 +223,7 @@
             </if>
                 update_time_ = NOW()
         </set>
-        where id_ = #{id,jdbcType=INTEGER}
+        where id_ = #{id,jdbcType=INTEGER} and tenant_id_ = #{tenantId}
     </update>
 
     <update id="batchUpdate" parameterType="com.ym.mec.biz.dal.entity.DegreeRegistration">
@@ -299,7 +301,7 @@
 	            </if>
                     update_time_ = NOW()
             </set>
-            where id_ = #{degree.id,jdbcType=INTEGER}
+            where id_ = #{degree.id,jdbcType=INTEGER} and tenant_id_ = #{degree.tenantId}
         </foreach>
     </update>
 

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

@@ -14,6 +14,7 @@
 		<result column="course_date_" property="courseDate"/>
 		<result column="start_time_" property="startTime"/>
 		<result column="end_time_" property="endTime"/>
+		<result column="tenant_id_" property="tenantId" />
 	</resultMap>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -23,7 +24,7 @@
 	
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="DemoGroupCoursesPlan">
-		SELECT * FROM demo_group_courses_plan ORDER BY id_
+		SELECT * FROM demo_group_courses_plan where tenant_id_ = #{tenantId} ORDER BY id_
 	</select>
 	
 	<!-- 向数据库增加一条记录 -->
@@ -33,10 +34,10 @@
 		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
 		</selectKey>
 		-->
-		INSERT INTO demo_group_courses_plan (demo_group_id_,create_time_,course_date_,start_time_,end_time_)
+		INSERT INTO demo_group_courses_plan (demo_group_id_,create_time_,course_date_,start_time_,end_time_,tenant_id_)
 		VALUE
 		<foreach collection="dates" item="date" separator=",">
-			(#{demoGroupId},now(),#{date},#{date},DATE_ADD(#{date},INTERVAL #{classMinutes} MINUTE))
+			(#{demoGroupId},now(),#{date},#{date},DATE_ADD(#{date},INTERVAL #{classMinutes} MINUTE),#{tenantId})
 		</foreach>
 	</insert>
 
@@ -47,8 +48,8 @@
 		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL
 		</selectKey>
 		-->
-		INSERT INTO demo_group_courses_plan (id_,demo_group_id_,course_date_,create_time_,status_,start_time_,end_time_)
-		VALUES(#{id},#{demoGroupId},#{courseDate},now(),#{status, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{startTime},#{endTime})
+		INSERT INTO demo_group_courses_plan (id_,demo_group_id_,course_date_,create_time_,status_,start_time_,end_time_,tenant_id_)
+		VALUES(#{id},#{demoGroupId},#{courseDate},now(),#{status, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{startTime},#{endTime},#{tenantId})
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -75,7 +76,7 @@
 		<if test="endTime!=null">
 			end_time_=#{endTime},
 		</if>
-		</set> WHERE id_ = #{id}
+		</set> WHERE id_ = #{id} and tenant_id_ = #{tenantId}
 	</update>
 	
 	<!-- 根据主键删除一条记录 -->
@@ -88,12 +89,12 @@
 
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="DemoGroupCoursesPlan" parameterType="map">
-		SELECT * FROM demo_group_courses_plan ORDER BY id_ <include refid="global.limit"/>
+		SELECT * FROM demo_group_courses_plan where tenant_id_ = #{tenantId} ORDER BY id_ <include refid="global.limit"/>
 	</select>
 	
 	<!-- 查询当前表的总记录数 -->
 	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM demo_group_courses_plan
+		SELECT COUNT(*) FROM demo_group_courses_plan where tenant_id_ = #{tenantId}
 	</select>
 
     <select id="findByDateZone" resultMap="DemoGroupCoursesPlan">

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

@@ -39,7 +39,7 @@
 
     <!-- 全查询 -->
     <select id="findAll" resultMap="DemoGroup">
-		SELECT * FROM demo_group ORDER BY id_
+		SELECT * FROM demo_group where tenant_id_ = #{tenantId} ORDER BY id_
 	</select>
 
     <select id="findById" resultMap="DemoGroup">
@@ -73,9 +73,6 @@
     <update id="update" parameterType="com.ym.mec.biz.dal.entity.DemoGroup">
         UPDATE demo_group
         <set>
-            <if test="tenantId != null">
-                tenant_id_ = #{tenantId},
-            </if>
             <if test="userId != null">
                 user_id_ = #{userId},
             </if>
@@ -98,7 +95,7 @@
                 subject_id_ = #{subjectId},
             </if>
         </set>
-        WHERE id_ = #{id}
+        WHERE id_ = #{id} and tenant_id_ = #{tenantId}
     </update>
 
     <!-- 根据主键删除一条记录 -->
@@ -108,13 +105,13 @@
 
     <!-- 分页查询 -->
     <select id="queryPage" resultMap="DemoGroup" parameterType="map">
-        SELECT * FROM demo_group ORDER BY id_
+        SELECT * FROM demo_group where tenant_id_ = #{tenantId} ORDER BY id_
         <include refid="global.limit"/>
     </select>
 
     <!-- 查询当前表的总记录数 -->
     <select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM demo_group
+		SELECT COUNT(*) FROM demo_group where tenant_id_ = #{tenantId}
 	</select>
 
     <select id="organIdListByDemoGroupId" resultType="int">

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

@@ -46,6 +46,7 @@
 		<result column="operatorName" property="operatorName" />
 		<result column="next_visit_date_" property="nextVisitDate" />
 		<result column="next_visit_date_" property="nextVisitDateStr" />
+		<result column="tenant_id_" property="tenantId" />
 	</resultMap>
 	
 	<resultMap type="com.ym.mec.biz.dal.dto.EmployeeInfoDto" id="EmployeeInfoDto" extends="EmployeeInfo">
@@ -67,7 +68,7 @@
 
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="EmployeeInfo">
-		SELECT * FROM employee_info ORDER
+		SELECT * FROM employee_info where tenant_id_ = #{tenantId} ORDER
 		BY id_
 	</select>
 
@@ -77,8 +78,8 @@
 		<!-- <selectKey resultClass="int" keyProperty="id" > SELECT SEQ_WSDEFINITION_ID.nextval 
 			AS ID FROM DUAL </selectKey> -->
 		INSERT INTO employee_info
-		(id_,real_name_,mobile_no_,wechat_no_,id_card_,age_,gender_,birthdate_,emergency_contact_name_,emergency_contact_relation_,emergency_contact_phone_,live_city_,intention_city_,educational_background_,subject_id_list_,assessment_result_,other_comment_,entry_date_,organ_id_,position_,status_,is_probation_period_,bank_card_no_,bank_address_,resignation_date_,operator_id_,source_from_,create_time_,update_time_,job_subject_id_list_,resignation_reason_,job_type_,job_nature_,hrbp_)
-		VALUES(#{id},#{realName},#{mobileNo},#{wechatNo},#{idCard},#{age},#{gender},#{birthdate},#{emergencyContactName},#{emergencyContactRelation},#{emergencyContactPhone},#{liveCity},#{intentionCity},#{educationalBackground},#{subjectIdList},#{assessmentResult},#{otherComment},#{entryDate},#{organId},#{position,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{isProbationPeriod},#{bankCardNo},#{bankAddress},#{resignationDate},#{operatorId},#{sourceFrom},#{createTime},#{updateTime},#{jobSubjectIdList},#{resignationReason},#{jobType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{jobNature,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{hrbp})
+		(id_,real_name_,mobile_no_,wechat_no_,id_card_,age_,gender_,birthdate_,emergency_contact_name_,emergency_contact_relation_,emergency_contact_phone_,live_city_,intention_city_,educational_background_,subject_id_list_,assessment_result_,other_comment_,entry_date_,organ_id_,position_,status_,is_probation_period_,bank_card_no_,bank_address_,resignation_date_,operator_id_,source_from_,create_time_,update_time_,job_subject_id_list_,resignation_reason_,job_type_,job_nature_,hrbp_,tenant_id_)
+		VALUES(#{id},#{realName},#{mobileNo},#{wechatNo},#{idCard},#{age},#{gender},#{birthdate},#{emergencyContactName},#{emergencyContactRelation},#{emergencyContactPhone},#{liveCity},#{intentionCity},#{educationalBackground},#{subjectIdList},#{assessmentResult},#{otherComment},#{entryDate},#{organId},#{position,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{isProbationPeriod},#{bankCardNo},#{bankAddress},#{resignationDate},#{operatorId},#{sourceFrom},#{createTime},#{updateTime},#{jobSubjectIdList},#{resignationReason},#{jobType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{jobNature,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{hrbp},#{tenantId})
 	</insert>
 
 	<!-- 根据主键查询一条记录 -->
@@ -149,7 +150,7 @@
 			</if>
 				source_from_ = #{sourceFrom}
 		</set>
-		WHERE id_ = #{id}
+		WHERE id_ = #{id} and tenant_id_ = #{tenantId}
 	</update>
 
 	<!-- 根据主键删除一条记录 -->
@@ -159,6 +160,7 @@
 	
 	<sql id="queryPageMap">
 		<where>
+			tenant_id_ = #{tenantId}
 			<if test="notMobileAndWechat == 1">
             	AND ei.mobile_no_ IS NULL AND ei.wechat_no_ IS NULL
 	        </if>

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

@@ -29,6 +29,7 @@
         <result column="post_dept_ids_" property="postDeptIds"/>
         <result column="bank_card_" property="bankCard"/>
         <result column="open_bank_address_" property="openBankAddress"/>
+		<result column="tenant_id_" property="tenantId" />
     </resultMap>
 
     <resultMap type="com.ym.mec.auth.api.entity.SysUser" id="SysUser">
@@ -63,7 +64,7 @@
 
     <!-- 全查询 -->
     <select id="findAll" resultMap="Employee">
-		SELECT * FROM employee ORDER BY user_id_
+		SELECT * FROM employee where tenant_id_ = #{tenantId} ORDER BY user_id_
 	</select>
 
     <!-- 向数据库增加一条记录 -->
@@ -71,22 +72,22 @@
             keyProperty="id">
         INSERT INTO employee
         (user_id_,organ_id_list_,job_nature_,is_probation_period_,education_background_,graduate_school_,technical_titles_,
-        entry_date_,certificate_type_,certificate_num_,update_time_,create_time_,introduction_,demission_date_,contact_address_,postal_code_,dept_id_,dept_ids_,post_ids_,post_dept_ids_)
+        entry_date_,certificate_type_,certificate_num_,update_time_,create_time_,introduction_,demission_date_,contact_address_,postal_code_,dept_id_,dept_ids_,post_ids_,post_dept_ids_,tenant_id_)
         VALUES(#{userId},#{organIdList},#{jobNature},#{isProbationPeriod},#{educationBackground},#{graduateSchool},
-        #{technicalTitles},#{entryDate},#{certificateType},#{certificateNum},now(),now(),#{introduction},#{demissionDate},#{contactAddress},#{postalCode},#{deptId},#{deptIds},#{postIds},#{postDeptIds})
+        #{technicalTitles},#{entryDate},#{certificateType},#{certificateNum},now(),now(),#{introduction},#{demissionDate},#{contactAddress},#{postalCode},#{deptId},#{deptIds},#{postIds},#{postDeptIds},#{tenantId})
     </insert>
 
     <insert id="batchAddEmployeeRole">
-        INSERT INTO sys_user_role(user_id_,role_id_) values
+        INSERT INTO sys_user_role(user_id_,role_id_,tenant_id_) values
         <foreach collection="roleIds" item="item" index="index" separator=",">
-            (#{userId},#{item})
+            (#{userId},#{item},#{tenantId})
         </foreach>
     </insert>
 
     <insert id="batchInsertRoleMenu">
-        INSERT INTO sys_role_menu (role_id_,menu_id_) VALUES
+        INSERT INTO sys_role_menu (role_id_,menu_id_,tenant_id_) VALUES
         <foreach collection="menuIds" item="item" index="index" separator=",">
-            (#{roleId}, #{item})
+            (#{roleId}, #{item},#{tenantId})
         </foreach>
     </insert>
 
@@ -159,7 +160,7 @@
                 post_dept_ids_ = #{postDeptIds},
             </if>
         </set>
-        WHERE user_id_ = #{userId}
+        WHERE user_id_ = #{userId} and tenant_id_ = #{tenantId}
     </update>
 
     <update id="updatePassword">
@@ -192,13 +193,13 @@
 
     <!-- 分页查询 -->
     <select id="queryPage" resultMap="Employee" parameterType="map">
-        SELECT * FROM employee ORDER BY user_id_
+        SELECT * FROM employee where tenant_id_ = #{tenantId} ORDER BY user_id_
         <include refid="global.limit"/>
     </select>
 
     <!-- 查询当前表的总记录数 -->
     <select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM employee
+		SELECT COUNT(*) FROM employee where tenant_id_ = #{tenantId}
 	</select>
 
 
@@ -235,7 +236,7 @@
             LEFT JOIN sys_user_role sur ON sur.user_id_ = e.user_id_
         </if>
         <where>
-                su.del_flag_ = 0
+                su.del_flag_ = 0 and su.tenant_id_ = #{tenantId}
             <if test="lockFlag != null">
                 AND su.lock_flag_ = #{lockFlag}
             </if>
@@ -271,7 +272,7 @@
             LEFT JOIN sys_user_role sur ON sur.user_id_ = e.user_id_
         </if>
         <where>
-            su.lock_flag_ = 0 AND su.del_flag_ = 0
+            su.lock_flag_ = 0 AND su.del_flag_ = 0 and su.tenant_id_ = #{tenantId}
             <if test="organId != null">
                 AND INTE_ARRAY(e.organ_id_list_,#{organId})
             </if>

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

@@ -11,6 +11,7 @@
 		<result column="content_" property="content" />
 		<result column="next_visit_date_" property="nextVisitDate" />
 		<result column="create_time_" property="createTime" />
+		<result column="tenant_id_" property="tenantId" />
 	</resultMap>
 
 	<!-- 根据主键查询一条记录 -->
@@ -21,7 +22,7 @@
 
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="EmployeeVisit">
-		SELECT * FROM employee_visit
+		SELECT * FROM employee_visit where tenant_id_ = #{tenantId}
 		ORDER BY id_
 	</select>
 
@@ -31,8 +32,8 @@
 		<!-- <selectKey resultClass="int" keyProperty="id" > SELECT SEQ_WSDEFINITION_ID.nextval 
 			AS ID FROM DUAL </selectKey> -->
 		INSERT INTO employee_visit
-		(id_,employee_info_id_,operator_id_,content_,next_visit_date_,create_time_)
-		VALUES(#{id},#{employeeInfoId},#{operatorId},#{content},#{nextVisitDate},#{createTime})
+		(id_,employee_info_id_,operator_id_,content_,next_visit_date_,create_time_,tenant_id_)
+		VALUES(#{id},#{employeeInfoId},#{operatorId},#{content},#{nextVisitDate},#{createTime},#{tenantId})
 	</insert>
 
 	<!-- 根据主键查询一条记录 -->
@@ -58,7 +59,7 @@
 				create_time_ = #{createTime},
 			</if>
 		</set>
-		WHERE id_ = #{id}
+		WHERE id_ = #{id} and tenant_id_ = #{tenantId}
 	</update>
 
 	<!-- 根据主键删除一条记录 -->
@@ -68,13 +69,13 @@
 
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="EmployeeVisit" parameterType="map">
-		SELECT * FROM employee_visit ORDER BY id_
+		SELECT * FROM employee_visit where tenant_id_ = #{tenantId} ORDER BY id_
 		<include refid="global.limit" />
 	</select>
 
 	<!-- 查询当前表的总记录数 -->
 	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM employee_visit
+		SELECT COUNT(*) FROM employee_visit where tenant_id_ = #{tenantId}
 	</select>
 	
 	<select id="queryByEmployeeInfoId" resultMap="EmployeeVisit">

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

@@ -21,10 +21,12 @@
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
 		<result column="organ_name_" property="organName" />
+		<result column="tenant_id_" property="tenantId" />
 	</resultMap>
 
 	<sql id="queryPageCondition">
 		<where>
+			tenant_id_ = #{tenantId}
 			<if test="teacherId != null">
 				and teacher_id_ = #{teacherId}
 			</if>
@@ -53,15 +55,15 @@
 	
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="ExtracurricularExercises">
-		SELECT * FROM extracurricular_exercises ORDER BY id_
+		SELECT * FROM extracurricular_exercises where tenant_id_ = #{tenantId} ORDER BY id_
 	</select>
 	
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.ExtracurricularExercises" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
 		INSERT INTO extracurricular_exercises (teacher_id_,student_id_list_,batch_no_,
-		                                       title_,attachments_,content_,expire_date_,completed_num_,expect_num_,create_time_,update_time_)
+		                                       title_,attachments_,content_,expire_date_,completed_num_,expect_num_,create_time_,update_time_,tenant_id_)
 		VALUES(#{teacherId},#{studentIdList},#{batchNo},#{title},#{attachments},
-		       #{content},#{expireDate},#{completedNum},#{expectNum},NOW(), NOW())
+		       #{content},#{expireDate},#{completedNum},#{expectNum},NOW(), NOW(),#{tenantId})
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -96,7 +98,7 @@
 			completed_num_ = #{completedNum},
 			</if>
 			update_time_ = NOW()
-		</set> WHERE id_ = #{id}
+		</set> WHERE id_ = #{id} and tenant_id_ = #{tenantId}
 	</update>
 	
 	<!-- 根据主键删除一条记录 -->
@@ -124,6 +126,7 @@
 
 	<sql id="queryExtraExercisesCondition">
 		<where>
+			tenant_id_ = #{tenantId}
 			<if test="teacherId!=null">
 				teacher_id_=#{teacherId}
 			</if>
@@ -215,6 +218,7 @@
 		SELECT id_, create_time_,'EXERCISES' type_
 		FROM extracurricular_exercises
 		<where>
+			tenant_id_ = #{tenantId}
 			<if test="teacherId!=null">
 				AND teacher_id_ = #{teacherId}
 			</if>
@@ -226,6 +230,7 @@
 		SELECT ch.id_,ch.create_time_,'HOMEWORK' type_ FROM course_homework ch
 		LEFT JOIN course_schedule_teacher_salary csts ON ch.course_schedule_id_ = csts.course_schedule_id_ AND csts.teacher_role_ = 'BISHOP'
 		<where>
+			tenant_id_ = #{tenantId}
 			<if test="teacherId!=null">
 				AND csts.user_id_ = #{teacherId}
 			</if>
@@ -243,6 +248,7 @@
 		SELECT id_, create_time_,'EXERCISES' type_
 		FROM extracurricular_exercises
 		<where>
+			tenant_id_ = #{tenantId}
 			<if test="teacherId!=null">
 				AND teacher_id_ = #{teacherId}
 			</if>
@@ -254,6 +260,7 @@
 		SELECT ch.id_,ch.create_time_,'HOMEWORK' type_ FROM course_homework ch
 		LEFT JOIN course_schedule_teacher_salary csts ON ch.course_schedule_id_ = csts.course_schedule_id_ AND csts.teacher_role_ = 'BISHOP'
 		<where>
+			tenant_id_ = #{tenantId}
 			<if test="teacherId!=null">
 				AND csts.user_id_ = #{teacherId}
 			</if>

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

@@ -16,6 +16,7 @@
 		<result column="parent_id_" property="parentId" />
 		<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>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -25,7 +26,7 @@
 	
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="ExtracurricularExercisesMessage">
-		SELECT * FROM extracurricular_exercises_message ORDER BY id_
+		SELECT * FROM extracurricular_exercises_message where tenant_id_ = #{tenantId} ORDER BY id_
 	</select>
 	
 	<!-- 向数据库增加一条记录 -->
@@ -35,8 +36,8 @@
 		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
 		</selectKey>
 		-->
-		INSERT INTO extracurricular_exercises_message (id_,extracurricular_exercises_reply_id_,user_id_,role_,content_,create_time_,parent_id_,msg_type_)
-		VALUES(#{id},#{extracurricularExercisesReplyId},#{userId},#{role},#{content},NOW(),#{parentId},#{msgType, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler})
+		INSERT INTO extracurricular_exercises_message (id_,extracurricular_exercises_reply_id_,user_id_,role_,content_,create_time_,parent_id_,msg_type_,tenant_id_)
+		VALUES(#{id},#{extracurricularExercisesReplyId},#{userId},#{role},#{content},NOW(),#{parentId},#{msgType, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{tenantId})
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -64,7 +65,7 @@
 			<if test="extracurricularExercisesReplyId != null">
 			extracurricular_exercises_reply_id_ = #{extracurricularExercisesReplyId},
 			</if>
-		</set> WHERE id_ = #{id}
+		</set> WHERE id_ = #{id} and tenant_id_ = #{tenantId}
 	</update>
 	
 	<!-- 根据主键删除一条记录 -->
@@ -74,16 +75,17 @@
 	
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="ExtracurricularExercisesMessage" parameterType="map">
-		SELECT * FROM extracurricular_exercises_message ORDER BY id_ <include refid="global.limit"/>
+		SELECT * FROM extracurricular_exercises_message where tenant_id_ = #{tenantId} ORDER BY id_ <include refid="global.limit"/>
 	</select>
 	
 	<!-- 查询当前表的总记录数 -->
 	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM extracurricular_exercises_message
+		SELECT COUNT(*) FROM extracurricular_exercises_message where tenant_id_ = #{tenantId}
 	</select>
 
 	<sql id="StudentExtraCommentsQueryCondition">
 		<where>
+			tenant_id_ = #{tenantId}
 			<if test="studentCourseHomeworkId!=null">
 				AND extracurricular_exercises_reply_id_=#{studentCourseHomeworkId}
 			</if>

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

@@ -23,6 +23,7 @@
 		<result column="organ_name_" property="organName" />
 		<result column="submit_time_" property="submitTime" />
 		<result column="music_score_id_" property="musicScoreId" />
+		<result column="tenant_id_" property="tenantId" />
 		<association property="extracurricularExercises" columnPrefix="ee_" resultMap="com.ym.mec.biz.dal.dao.ExtracurricularExercisesDao.ExtracurricularExercises"/>
 	</resultMap>
 
@@ -40,6 +41,7 @@
 
 	<sql id="queryPageCondition">
 		<where>
+			tenant_id_ = #{tenantId}
 			<if test="extracurricularExercisesId != null">
 				AND extracurricular_exercises_id_ = #{extracurricularExercisesId}
 			</if>
@@ -83,20 +85,20 @@
 	
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="ExtracurricularExercisesReply">
-		SELECT * FROM extracurricular_exercises_reply ORDER BY id_
+		SELECT * FROM extracurricular_exercises_reply where tenant_id_ = #{tenantId} ORDER BY id_
 	</select>
 	
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.ExtracurricularExercisesReply" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		INSERT INTO extracurricular_exercises_reply (extracurricular_exercises_id_,user_id_,attachments_,create_time_,update_time_,remark_,status_,is_replied_,is_view_,is_replied_timely_,music_score_id_)
-		VALUES(#{extracurricularExercisesId},#{userId},#{attachments},NOW(),NOW(),#{remark},#{status},#{isReplied},#{isView},#{isRepliedTimely},#{musicScoreId})
+		INSERT INTO extracurricular_exercises_reply (extracurricular_exercises_id_,user_id_,attachments_,create_time_,update_time_,remark_,status_,is_replied_,is_view_,is_replied_timely_,music_score_id_,tenant_id_)
+		VALUES(#{extracurricularExercisesId},#{userId},#{attachments},NOW(),NOW(),#{remark},#{status},#{isReplied},#{isView},#{isRepliedTimely},#{musicScoreId},#{tenantId})
 	</insert>
 
 	<insert id="batchInsert" parameterType="com.ym.mec.biz.dal.entity.ExtracurricularExercisesReply" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		INSERT INTO extracurricular_exercises_reply (extracurricular_exercises_id_,user_id_,attachments_,create_time_,update_time_,remark_,status_,is_replied_,is_view_,is_replied_timely_,music_score_id_)
+		INSERT INTO extracurricular_exercises_reply (extracurricular_exercises_id_,user_id_,attachments_,create_time_,update_time_,remark_,status_,is_replied_,is_view_,is_replied_timely_,music_score_id_,tenant_id_)
 		VALUES
 		<foreach collection="replies" item="reply" separator=",">
-			(#{reply.extracurricularExercisesId},#{reply.userId},#{reply.attachments},NOW(),NOW(),#{reply.remark},#{reply.status},#{reply.isReplied},#{reply.isView},#{reply.isRepliedTimely},#{reply.musicScoreId})
+			(#{reply.extracurricularExercisesId},#{reply.userId},#{reply.attachments},NOW(),NOW(),#{reply.remark},#{reply.status},#{reply.isReplied},#{reply.isView},#{reply.isRepliedTimely},#{reply.musicScoreId},#{replay.tenantId})
 		</foreach>
 	</insert>
 
@@ -138,7 +140,7 @@
 				submit_time_ = #{submitTime},
 			</if>
 			update_time_ = NOW()
-		</set> WHERE id_ = #{id}
+		</set> WHERE id_ = #{id} and tenant_id_ = #{tenantId}
 	</update>
 	
 	<!-- 根据主键删除一条记录 -->
@@ -209,6 +211,7 @@
 
 	<sql id="queryStudentExtraExercisesCondition">
 		<where>
+			tenant_id_ = #{tenantId}
 			<if test="studentId!=null">
 				AND eer.user_id_=#{studentId}
 			</if>
@@ -245,6 +248,7 @@
 
 	<sql id="queryExtraExercisesCondition">
 		<where>
+			tenant_id_ = #{tenantId}
 			<if test="extracurricularExercisesId != null">
 				AND extracurricular_exercises_id_ = #{extracurricularExercisesId}
 			</if>
@@ -311,41 +315,6 @@
 		left join organization o on o.id_ = u.organ_id_
 		<include refid="queryExtraExercisesCondition"/>
 	</select>
-    <select id="findNoPracticeStudentExercisesInWeek" resultMap="ExtracurricularExercisesReply">
-		SELECT
-			eer.id_,
-			eer.user_id_,
-			eer.status_,
-			eer.submit_time_,
-			eer.is_replied_,
-			eer.is_replied_timely_
-		FROM
-			extracurricular_exercises_reply eer
-		WHERE
-			DATE_FORMAT( eer.create_time_, '%Y-%m-%d' ) BETWEEN #{monday} AND #{sunday}
-			AND EXISTS (
-				SELECT
-					cssp.user_id_
-				FROM
-					course_schedule_student_payment cssp
-					LEFT JOIN course_schedule cs ON cssp.course_schedule_id_ = cs.id_
-					LEFT JOIN student s ON cssp.user_id_ = s.user_id_
-				WHERE
-					cssp.group_type_ = 'PRACTICE'
-					AND cssp.user_id_=eer.user_id_
-					AND s.service_tag_ = 1
-					AND cssp.user_id_ NOT IN (
-					SELECT
-						cssp1.user_id_
-					FROM
-						course_schedule_student_payment cssp1
-						LEFT JOIN course_schedule cs1 ON cssp1.course_schedule_id_ = cs1.id_
-					WHERE
-						cssp1.group_type_ = 'PRACTICE'
-						AND cs1.class_date_ BETWEEN #{monday} AND #{sunday}
-					)
-			)
-	</select>
 
 	<resultMap id="StudentServiceHomeworkDto" type="com.ym.mec.biz.dal.dto.StudentServiceHomeworkDto">
 		<result column="id_" property="id" />
@@ -370,7 +339,7 @@
 		FROM
 			extracurricular_exercises_reply eer
 		WHERE
-			DATE_FORMAT( eer.create_time_, '%Y-%m-%d' ) BETWEEN #{monday} AND #{sunday}
+			DATE_FORMAT( eer.create_time_, '%Y-%m-%d' ) BETWEEN #{monday} AND #{sunday} and eer.tenant_id_ = #{tenantId}
 		UNION ALL
 		SELECT
 			sch.id_,
@@ -384,7 +353,7 @@
 			student_course_homework sch
 			LEFT JOIN course_schedule cs ON cs.id_ = sch.course_schedule_id_
 		WHERE
-			cs.group_type_='PRACTICE' AND DATE_FORMAT( sch.create_time_, '%Y-%m-%d' ) BETWEEN #{monday} AND #{sunday}
+			cs.group_type_='PRACTICE' AND DATE_FORMAT( sch.create_time_, '%Y-%m-%d' ) BETWEEN #{monday} AND #{sunday} and sch.tenant_id_ = #{tenantId}
 	</select>
 
 	<resultMap id="StudentServiceDetailDto" type="com.ym.mec.biz.dal.dto.StudentServiceDetailDto">
@@ -500,7 +469,7 @@
 			extracurricular_exercises_reply eer
 			LEFT JOIN extracurricular_exercises ee ON eer.extracurricular_exercises_id_=ee.id_
 		WHERE
-			DATE_FORMAT( eer.create_time_, '%Y-%m-%d' ) BETWEEN #{startDate} AND #{endDate}
+			DATE_FORMAT( eer.create_time_, '%Y-%m-%d' ) BETWEEN #{startDate} AND #{endDate} and eer.tenant_id_ = #{tenantId}
 	</select>
 
 	<select id="checkStudentHaveExercisesInDateRange" resultType="java.lang.Integer">
@@ -574,7 +543,7 @@
 			LEFT JOIN sys_user su ON ee.teacher_id_ = su.id_
 			LEFT JOIN extracurricular_exercises_reply eer ON ee.id_ = eer.extracurricular_exercises_id_
 			LEFT JOIN student_registration sr ON eer.user_id_ = sr.user_id_
-		WHERE sr.music_group_status_='NORMAL'
+		WHERE sr.music_group_status_='NORMAL' and ee.tenant_id_ = #{tenantId}
 			<if test="groupIds!=null and groupIds.size()>0">
 				AND sr.music_group_id_ IN
 				<foreach collection="groupIds" item="groupId" open="(" close=")" separator=",">

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

@@ -23,6 +23,7 @@
         <result column="cause_" property="cause"/>
         <result column="create_time_" property="createTime"/>
         <result column="update_time_" property="updateTime"/>
+		<result column="tenant_id_" property="tenantId" />
     </resultMap>
 
     <!-- 根据主键查询一条记录 -->
@@ -36,7 +37,7 @@
     <select id="findAll" resultMap="FinancialExpenditure">
         SELECT *
         FROM financial_expenditure
-        WHERE del_flag_ = 0
+        WHERE del_flag_ = 0 and tenant_id_ = #{tenantId}
         ORDER BY id_
     </select>
 
@@ -46,26 +47,26 @@
             keyProperty="id">
         INSERT INTO financial_expenditure (batch_no_, financial_process_no_, dingtalk_process_no_,
                                            organ_id_, cooperation_organ_id_, apply_user_, amount_, item_detail_,
-                                           payment_time_, cause_, create_time_, update_time_, fee_project_, type_)
+                                           payment_time_, cause_, create_time_, update_time_, fee_project_, type_, tenant_id_)
         VALUES (#{batchNo}, #{financialProcessNo}, #{dingtalkProcessNo}, #{organId}, #{cooperationOrganId},
                 #{applyUser}, #{amount},
                 #{itemDetail}, #{paymentTime}, #{cause}, now(), now(),
                 #{feeProject,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-                #{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler})
+                #{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{tenantId})
     </insert>
 
     <insert id="batchInsert" parameterType="com.ym.mec.biz.dal.entity.FinancialExpenditure" useGeneratedKeys="true"
             keyColumn="id"
             keyProperty="id">
         INSERT INTO financial_expenditure (batch_no_,financial_process_no_,dingtalk_process_no_,
-        organ_id_,cooperation_organ_id_,apply_user_,amount_,item_detail_,payment_time_,cause_,create_time_,update_time_,fee_project_,type_)
+        organ_id_,cooperation_organ_id_,apply_user_,amount_,item_detail_,payment_time_,cause_,create_time_,update_time_,fee_project_,type_,tenant_id_)
         VALUES
         <foreach collection="financialExpenditures" item="item" separator=",">
             (#{item.batchNo},#{item.financialProcessNo},#{item.dingtalkProcessNo},#{item.organId},
             #{item.cooperationOrganId},#{item.applyUser},#{item.amount},
             #{item.itemDetail},#{item.paymentTime},#{item.cause},now(),now(),
             #{item.feeProject,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-            #{item.type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler})
+            #{item.type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{item.tenantId})
         </foreach>
     </insert>
 
@@ -111,7 +112,7 @@
             </if>
             update_time_ = NOW()
         </set>
-        WHERE id_ = #{id}
+        WHERE id_ = #{id} and tenant_id_ = #{tenantId}
     </update>
 
     <!-- 根据主键删除一条记录 -->
@@ -128,7 +129,7 @@
 
     <sql id="queryPageSql">
         <where>
-            fe.del_flag_ = 0
+            fe.del_flag_ = 0 and fe.tenant_id_ = #{tenantId}
             <if test="batchNo != null and batchNo != ''">
                 AND fe.batch_no_ = #{batchNo}
             </if>
@@ -206,9 +207,10 @@
         FROM financial_expenditure
         WHERE payment_time_ >= #{startTime}
           AND payment_time_ <= #{endTime}
-          AND del_flag_ = 0
+          AND del_flag_ = 0 and tenant_id_ = #{tenantId}
         GROUP BY organ_id_, cooperation_organ_id_, type_
         ]]></select>
+        
     <select id="countBydingTalk" resultType="java.lang.String">
         SELECT dingtalk_process_no_ FROM financial_expenditure WHERE del_flag_ = 0 AND dingtalk_process_no_ IN
         <foreach collection="collect" separator="," open="(" close=")" item="item">