Merge remote-tracking branch 'origin/saas' into saas

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

@@ -160,7 +160,7 @@
 	
 	<sql id="queryPageMap">
 		<where>
-			tenant_id_ = #{tenantId}
+			ei.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/ExtracurricularExercisesReplyMapper.xml

@@ -41,7 +41,7 @@
 
 	<sql id="queryPageCondition">
 		<where>
-			tenant_id_ = #{tenantId}
+			eer.tenant_id_ = #{tenantId}
 			<if test="extracurricularExercisesId != null">
 				AND extracurricular_exercises_id_ = #{extracurricularExercisesId}
 			</if>

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

@@ -130,7 +130,7 @@
 
     <sql id="queryPageSql">
         <where>
-        	tenant_id_ = #{tenantId}
+        	iip.tenant_id_ = #{tenantId}
             <if test="itemId != null">
                 AND iip.item_id_ = #{itemId}
             </if>