Merge remote-tracking branch 'origin/master'

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

@@ -38,6 +38,7 @@ import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.RedisUtil;
 import com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser;
 import com.yifu.cloud.plus.v1.yifu.common.dapr.util.UpmsDaprUtils;
+import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -154,8 +155,8 @@ public class TSettleDomainServiceImpl extends ServiceImpl<TSettleDomainMapper, T
 					}
 				}
 				tSettleDomainInfo = baseMapper.selectOne(Wrappers.<TSettleDomain>query().lambda()
-						.eq(TSettleDomain::getDeleteFlag,CommonConstants.ZERO_STRING)
 						.eq(TSettleDomain::getDepartNo,tSettleDomain.getDepartNo())
+						.orderByDesc(BaseEntity::getCreateTime)
 						.last(CommonConstants.LAST_ONE_SQL));
 				if (Common.isNotNull(tSettleDomainInfo)) {
 					tSettleDomain.setId(tSettleDomainInfo.getId());
@@ -169,6 +170,7 @@ public class TSettleDomainServiceImpl extends ServiceImpl<TSettleDomainMapper, T
 						saveForEkp(res.getData().getUserIds(),tSettleDomain.getId());
 					}
 				}
+				tSettleDomain.setDeleteFlag(CommonConstants.ZERO_STRING);
 				if (Common.isNotNull(tSettleDomainInfo)) {
 					baseMapper.updateById(tSettleDomain);
 				} else {