Merge remote-tracking branch 'origin/developer-2023-02-15' into developer

haoban-manage3-service/src/main/resources/mapper/StaffMapper.xml

@@ -318,7 +318,7 @@
         
          <!--  其他占用  -->
         <if test="occupy != null and 1==occupy">
-        	and a.status_flag = 0 and a.del_time >= DATE_FORMAT(NOW(),'%Y-%m-%d') and a.active_status = 1  
+        	and a.status_flag = 0 and a.del_time >= DATE_FORMAT(NOW(),'%Y-%m-%d') and a.active_status = 1 and a.expire_time >= DATE_FORMAT(NOW(),'%Y-%m-%d')
         </if>
         <!--   -->
         <if test="occupy != null and 2==occupy">