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

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

@@ -145,6 +145,13 @@ 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())
+						.last(CommonConstants.LAST_ONE_SQL));
+				if (Common.isNotNull(tSettleDomainInfo)) {
+					tSettleDomain.setId(tSettleDomainInfo.getId());
+				}
 				// 处理服务团队数据权限 2022-09-19 fxj
 				if (Common.isNotNull(tSettleDomain.getServiceTeam())){
 					R<AllUserNaVo>  res = upmsDaprUtils.getUserIdsByUserNames(tSettleDomain.getServiceTeam());
@@ -154,12 +161,7 @@ public class TSettleDomainServiceImpl extends ServiceImpl<TSettleDomainMapper, T
 						saveForEkp(res.getData().getUserIds(),tSettleDomain.getId());
 					}
 				}
-				tSettleDomainInfo = baseMapper.selectOne(Wrappers.<TSettleDomain>query().lambda()
-						.eq(TSettleDomain::getDeleteFlag,CommonConstants.ZERO_STRING)
-						.eq(TSettleDomain::getDepartNo,tSettleDomain.getDepartNo())
-						.last(CommonConstants.LAST_ONE_SQL));
 				if (Common.isNotNull(tSettleDomainInfo)) {
-					tSettleDomain.setId(tSettleDomainInfo.getId());
 					baseMapper.updateById(tSettleDomain);
 				} else {
 					baseMapper.insert(tSettleDomain);