update

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

@@ -618,7 +618,9 @@
 	<select id="queryLowTeacherSalary" resultType="java.lang.Long">
 		SELECT DISTINCT tcs.user_id_ FROM teacher_course_statistics tcs
 		LEFT JOIN teacher t ON t.id_ = tcs.user_id_
-		WHERE t.job_nature_ = 'FULL_TIME' AND t.demission_date_ IS NULL AND DATE_FORMAT(tcs.month_,'%Y-%m') = #{monthStr} AND tcs.low_salary = 1
+		LEFT JOIN sys_user su ON su.id_ = tcs.user_id_
+		WHERE su.lock_flag_ = 0 AND su.del_flag_ = 0 AND t.job_nature_ = 'FULL_TIME' AND t.demission_date_ IS NULL
+		AND DATE_FORMAT(tcs.month_,'%Y-%m') = #{monthStr} AND tcs.low_salary = 1
 		<if test="organIdsStr != null and organIdsStr != ''">
 			AND FIND_IN_SET(tcs.organ_id_,#{organIdsStr})
 		</if>

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

@@ -109,13 +109,14 @@
     <!-- 查询当前表的总记录数 -->
     <select id="queryCount" resultType="int" parameterType="map">
         SELECT COUNT(tcs.id_) FROM teacher_course_statistics tcs
+        LEFT JOIN sys_user u ON tcs.user_id_ = u.id_
         LEFT JOIN teacher t ON t.id_ = tcs.user_id_
         <include refid="queryParams"/>
     </select>
 
     <sql id="queryParams">
         <where>
-            t.job_nature_ = 'FULL_TIME' AND t.demission_date_ IS NULL
+            u.lock_flag_ = 0 AND u.del_flag_ = 0 AND t.job_nature_ = 'FULL_TIME' AND t.demission_date_ IS NULL
             <if test="organId != null">
                 AND FIND_IN_SET(tcs.organ_id_,#{organId})
             </if>