浏览代码

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

zouxuan 4 年之前
父节点
当前提交
679f101f0b
共有 1 个文件被更改,包括 1 次插入0 次删除
  1. 1 0
      mec-biz/src/main/resources/config/mybatis/IndexBaseMonthDataMapper.xml

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

@@ -1071,6 +1071,7 @@
 		LEFT JOIN teacher t ON t.id_ = tcs.user_id_
 		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 t.is_settlement_salary_ = 1
 		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})