update

edu-auth/edu-auth-server/src/main/resources/config/mybatis/SysRoleMapper.xml

@@ -25,7 +25,7 @@
 
     <!-- 全查询 -->
     <select id="findAll" resultMap="SysRole">
-		SELECT * FROM sys_role WHERE del_flag_ = 0 ORDER BY upate_time_ DESC
+		SELECT * FROM sys_role WHERE del_flag_ = 0 AND tenant_id_ = #{tenantId} ORDER BY upate_time_ DESC
 	</select>
 
     <!-- 向数据库增加一条记录 -->
@@ -71,13 +71,13 @@
 
     <!-- 分页查询 -->
     <select id="queryPage" resultMap="SysRole" parameterType="map">
-        SELECT * FROM sys_role WHERE del_flag_ = 0 ORDER BY update_time_ DESC
+        SELECT * FROM sys_role WHERE del_flag_ = 0 AND tenant_id_ = #{tenantId} ORDER BY update_time_ DESC
         <include refid="global.limit"/>
     </select>
 
     <!-- 查询当前表的总记录数 -->
     <select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM sys_role WHERE del_flag_ = 0
+		SELECT COUNT(*) FROM sys_role WHERE del_flag_ = 0 AND tenant_id_ = #{tenantId}
 	</select>
 
     <select id="findRoleByUserId" resultMap="SysRole">

edu-auth/edu-auth-server/src/main/resources/config/mybatis/SysRoleMenuMapper.xml

@@ -14,12 +14,12 @@
 	
 	<!-- 根据主键查询一条记录 -->
 	<select id="get" resultMap="SysRoleMenu" parameterType="java.util.Map">
-		SELECT * FROM sys_role_menu WHERE role_id_ = #{roleId} AND menu_id_ = #{menuId}
+		SELECT * FROM sys_role_menu WHERE role_id_ = #{roleId} AND menu_id_ = #{menuId} AND tenant_id_ = #{tenantId}
 	</select>
 	
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="SysRoleMenu">
-		SELECT * FROM sys_role_menu ORDER BY role_id_,menu_id_
+		SELECT * FROM sys_role_menu WHERE tenant_id_ = #{tenantId} ORDER BY role_id_,menu_id_
 	</select>
 	
 	<!-- 向数据库增加一条记录 -->
@@ -43,12 +43,12 @@
 
     <!-- 分页查询 -->
 	<select id="queryPage" resultMap="SysRoleMenu" parameterType="map">
-		SELECT * FROM sys_role_menu ORDER BY role_id_,menu_id_ <include refid="global.limit"/>
+		SELECT * FROM sys_role_menu WHERE tenant_id_ = #{tenantId} ORDER BY role_id_,menu_id_ <include refid="global.limit"/>
 	</select>
 	
 	<!-- 查询当前表的总记录数 -->
 	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM sys_role_menu
+		SELECT COUNT(*) FROM sys_role_menu WHERE tenant_id_ = #{tenantId}
 	</select>
 	
 	<select id="queryPermissionsByRoleId" resultType="string" parameterType="int">

edu-auth/edu-auth-server/src/main/resources/config/mybatis/SysUserMapper.xml

@@ -34,6 +34,7 @@
 
     <!-- 查询条件 -->
     <sql id="queryCondition">
+        tenant_id_ = #{tenantId}
         <if test="userStartDate != null">
             and create_time_ &gt;= #{createStartDate}
         </if>
@@ -52,7 +53,7 @@
 
     <!-- 全查询 -->
     <select id="findAll" resultMap="SysUser">
-		SELECT * FROM sys_user ORDER BY id_
+		SELECT * FROM sys_user WHERE tenant_id_ = #{tenantId} ORDER BY id_
 	</select>
 
     <!-- 向数据库增加一条记录 -->

edu-cms/src/main/java/com/keao/edu/cms/controller/queryinfo/NewsInformationQueryInfo.java

@@ -65,12 +65,4 @@ public class NewsInformationQueryInfo extends QueryInfo {
 	public void setMemo(String memo) {
 		this.memo = memo;
 	}
-
-	public Integer getTenantId() {
-		return tenantId;
-	}
-
-	public void setTenantId(Integer tenantId) {
-		this.tenantId = tenantId;
-	}
 }

edu-common/src/main/java/com/keao/edu/common/page/QueryInfo.java

@@ -7,6 +7,8 @@
  */
 package com.keao.edu.common.page;
 
+import com.keao.edu.common.tenant.TenantContextHolder;
+
 /**
  * 查询对象基类
  */
@@ -27,9 +29,15 @@ public class QueryInfo {
 	 * 默认排序方向
 	 */
 	private String order = "desc";
+
+	private String tenantId= (String) TenantContextHolder.getTenantId();
 	
 	private String search;
-	
+
+	public String getTenantId() {
+		return tenantId;
+	}
+
 	public String getSearch() {
 		return search;
 	}

edu-user/edu-user-server/src/main/java/com/keao/edu/user/page/SubjectQueryInfo.java

@@ -12,17 +12,6 @@ public class SubjectQueryInfo extends QueryInfo {
     @ApiModelProperty(value = "节点状态，默认0未删除，1删除",required = false)
     private YesOrNoEnum delFlag = YesOrNoEnum.NO;
 
-    @ApiModelProperty(value = "对内1对外2",required = false)
-    private Integer tenantId;
-
-    public Integer getTenantId() {
-        return tenantId;
-    }
-
-    public void setTenantId(Integer tenantId) {
-        this.tenantId = tenantId;
-    }
-
     public YesOrNoEnum getDelFlag() {
         return delFlag;
     }

edu-user/edu-user-server/src/main/resources/config/mybatis/AgencyMapper.xml

@@ -25,7 +25,7 @@
 	
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="Agency">
-		SELECT * FROM agency ORDER BY id_
+		SELECT * FROM agency WHERE tenant_id_ = #{tenantId} ORDER BY id_
 	</select>
 	
 	<!-- 向数据库增加一条记录 -->
@@ -74,7 +74,7 @@
 
 	<sql id="agencyQueryPage">
 		<where>
-			del_flag_ = 0
+			del_flag_ = 0 AND tenant_id_ = #{tenantId}
 			<if test="settlementType">
 				AND settlement_type_ = #{settlementType}
 			</if>

edu-user/edu-user-server/src/main/resources/config/mybatis/EmployeeMapper.xml

@@ -62,7 +62,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>
 	
 	<!-- 向数据库增加一条记录 -->
@@ -135,7 +135,7 @@
 	</update>
 	<sql id="employeeQueryPage">
 		<where>
-				e.del_flag_ = 1
+				e.del_flag_ = 1 AND tenant_id_ = #{tenantId}
 			<if test="search != null and search != ''">
 				AND (e.user_id_ = #{search} OR su.phone_ LIKE CONCAT('%',#{search},'%') OR su.real_name_ LIKE CONCAT('%',#{search},'%'))
 			</if>

edu-user/edu-user-server/src/main/resources/config/mybatis/ExamLocationMapper.xml

@@ -25,7 +25,7 @@
 	
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="ExamLocation">
-		SELECT * FROM exam_location ORDER BY id_
+		SELECT * FROM exam_location WHERE tenant_id_ = #{tenantId} ORDER BY id_
 	</select>
 	
 	<!-- 向数据库增加一条记录 -->
@@ -76,7 +76,7 @@
 
 	<sql id="queryCondition">
 		<where>
-			del_flag_=0
+			del_flag_=0 AND tenant_id_ = #{tenantId}
 			<if test="isAvailable!=null">
 				AND is_available_=#{isAvailable}
 			</if>

edu-user/edu-user-server/src/main/resources/config/mybatis/ExamSongMapper.xml

@@ -26,7 +26,7 @@
 	
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="ExamSong">
-		SELECT * FROM exam_song ORDER BY id_
+		SELECT * FROM exam_song WHERE tenant_id_ = #{tenantId} ORDER BY id_
 	</select>
 	
 	<!-- 向数据库增加一条记录 -->
@@ -80,7 +80,7 @@
 
 	<sql id="queryCondition">
 		<where>
-			del_flag_=0
+			del_flag_=0 AND tenant_id_ = #{tenantId}
 			<if test="subjectList!=null">
 				AND FIND_IN_SET(#{subjectList}, subject_list_)
 			</if>

edu-user/edu-user-server/src/main/resources/config/mybatis/SubjectMapper.xml

@@ -25,7 +25,7 @@
 
     <!-- 全查询 -->
     <select id="findAll" resultMap="Subject">
-		SELECT * FROM subject ORDER BY id_
+		SELECT * FROM subject WHERE tenant_id_ = #{tenantId} ORDER BY id_
 	</select>
 
     <!-- 向数据库增加一条记录 -->
@@ -91,7 +91,7 @@
     </select>
 
     <select id="queryNameByIds" resultType="java.util.Map">
-        select id_ `key`,name_ `value` FROM `subject` s WHERE FIND_IN_SET(s.id_,#{subjectIds}) AND s.del_flag_ = 0
+        select id_ `key`,name_ `value` FROM `subject` s WHERE FIND_IN_SET(s.id_,#{subjectIds}) AND s.del_flag_ = 0 AND tenant_id_ = #{tenantId}
     </select>
 
     <select id="findSubSubjects" resultMap="Subject">
@@ -104,6 +104,7 @@
 
     <sql id="querySubPageSql">
         <where>
+            tenant_id_ = #{tenantId}
             <if test="parentId != null">
                 AND parent_subject_id_ = #{parentId}
             </if>

edu-user/edu-user-server/src/main/resources/config/mybatis/SysConfigMapper.xml

@@ -21,7 +21,7 @@
 
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="SysConfig">
-		SELECT * FROM sys_config where 1=1
+		SELECT * FROM sys_config where tenant_id_ = #{tenantId}
 		<if test="group != null">
 			and group_ = #{group}
 		</if>
@@ -71,13 +71,13 @@
 
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="SysConfig" parameterType="map">
-		SELECT * FROM sys_config ORDER BY id_
+		SELECT * FROM sys_config WHERE tenant_id_ = #{tenantId} ORDER BY id_
 		<include refid="global.limit" />
 	</select>
 
 	<!-- 查询当前表的总记录数 -->
 	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM sys_config
+		SELECT COUNT(*) FROM sys_config WHERE tenant_id_ = #{tenantId}
 	</select>
 	
 	<select id="findByParamName" resultMap="SysConfig">

edu-user/edu-user-server/src/main/resources/config/mybatis/SysUserMapper.xml

@@ -29,10 +29,12 @@
         <result column="id_card_no_" property="idCardNo"/>
         <result column="wechat_id_" property="wechatId"/>
         <result column="is_super_admin_" property="isSuperAdmin"/>
+        <result column="tenant_id_" property="tenantId"/>
     </resultMap>
 
     <!-- 查询条件 -->
     <sql id="queryCondition">
+        tenant_id_ = #{tenantId}
         <if test="userStartDate != null">
             and create_time_ &gt;= #{createStartDate}
         </if>
@@ -51,7 +53,7 @@
 
     <!-- 全查询 -->
     <select id="findAll" resultMap="SysUser">
-		SELECT * FROM sys_user ORDER BY id_
+		SELECT * FROM sys_user WHERE tenant_id_ = #{tenantId} ORDER BY id_
 	</select>
 
     <!-- 向数据库增加一条记录 -->

edu-user/edu-user-server/src/main/resources/config/mybatis/TeacherMapper.xml

@@ -77,7 +77,7 @@
 
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="Teacher">
-		SELECT * FROM teacher
+		SELECT * FROM teacher WHERE	tenant_id_ = #{tenantId}
 	</select>
 	
 	<!-- 向数据库增加一条记录 -->
@@ -91,7 +91,7 @@
 	</update>
 	<sql id="teacherQueryPage">
 		<where>
-			t.del_flag_ = 0
+			t.del_flag_ = 0 AND t.tenant_id_ = #{tenantId}
 			<if test="search != null and search != ''">
 				AND (t.user_id_ = 1
 				OR su.real_name_ LIKE CONCAT('%','','%')