Merge remote-tracking branch 'origin/MVP1.4' into MVP1.4

yifu-archives/yifu-archives-api/pom.xml

@@ -8,6 +8,7 @@
 		<groupId>com.yifu.cloud.plus.v1</groupId>
 		<artifactId>yifu</artifactId>
 		<version>1.0.0</version>
+		<relativePath/>
 	</parent>
 
 	<artifactId>yifu-archives-api</artifactId>

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TSettleDomainServiceImpl.java

@@ -94,6 +94,7 @@ public class TSettleDomainServiceImpl extends ServiceImpl<TSettleDomainMapper, T
 		try{
 			for(String userId : userIdList){
 				redisUtil.remove(CacheConstants.WXHR_SETTLE_DOMAIN_VOS_BY_USERID +"_"+userId);
+				redisUtil.remove(CacheConstants.WXHR_SETTLE_DOMAIN_NOS_BY_USERID +"_"+userId);
 				// 清空userinfo
 				Objects.requireNonNull(cacheManager.getCache(CacheConstants.USER_DETAILS)).clear();
 				redisUtil.remove(CacheConstants.USER_DETAILS +"::"+ user.getUsername());

yifu-business/yifu-business-biz/src/main/resources/mapper/TVacationInfoMapper.xml

@@ -78,11 +78,11 @@
 		<if test="query.vacationStatus != null and query.vacationStatus.trim() != ''">
 			<!-- 待休 -->
 			<if test="query.vacationStatus == '0'.toString()">
-                and now() <![CDATA[<]]> a.VACATION_START_TIME
+				and now() <![CDATA[<]]> a.VACATION_START_TIME and a.VACATION_STATUS = '4'
 			</if>
 			<!-- 休假中 -->
 			<if test="query.vacationStatus == '1'.toString()">
-                and now() <![CDATA[>=]]> a.VACATION_START_TIME and now() <![CDATA[<=]]> a.VACATION_END_TIME
+				and now() <![CDATA[>=]]> a.VACATION_START_TIME and now() <![CDATA[<=]]> a.VACATION_END_TIME and a.VACATION_STATUS = '4'
 			</if>
 			<!-- 到期待销假 -->
 			<if test="query.vacationStatus == '2'.toString()">