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

af78763c · jinxin · 77577f1b · 23931aa1 · af78763c
Commit af78763c authored Feb 02, 2023 by jinxin
Show whitespace changes
Inline Side-by-side

Showing with 1 additions and 1 deletions

StaffMapper.xml ...manage3-service/src/main/resources/mapper/StaffMapper.xml +1 -1

No files found.
--- a/haoban-manage3-service/src/main/resources/mapper/StaffMapper.xml
+++ b/haoban-manage3-service/src/main/resources/mapper/StaffMapper.xml
@@ -330,7 +330,7 @@
        		and a.active_status = 0  
        	</if>
        	<if test="permitState==1">
-        		and a.active_status = 1 and a.expire_time > now()  
+        		and a.active_status = 1 and a.expire_time > now()  and a.expire_time >  DATE_ADD(DATE_FORMAT(NOW(),'%Y-%m-%d'),INTERVAL 30 DAY)
        	</if>
        	
        	<if test="permitState==2">