4 gadi atpakaļ · 4d65498888
--- a/mec-biz/src/main/resources/config/mybatis/IndexBaseMonthDataMapper.xml
+++ b/mec-biz/src/main/resources/config/mybatis/IndexBaseMonthDataMapper.xml
@@ -274,7 +274,7 @@
 
															 				AND su.lock_flag_ = 0
														
 
															 			</if>
														
 
															 		  	<if test="isDemission!=null">
														
 
															-				AND (su.lock_flag_ = 1 OR t.demission_date_ IS NOT NULL)
														
 
															+				AND (su.lock_flag_ = 1 OR t.demission_date_&lt;NOW())
														
 
															 			</if>
														
 
															 			AND t.organ_id_ IS NOT NULL
														
 
															 			<if test="jobNature!=null">