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

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/mapper/TSettleDomainMapper.java

@@ -108,6 +108,4 @@ public interface TSettleDomainMapper extends BaseMapper<TSettleDomain> {
 													  @Param("customerName")String customerName,
 													  @Param("userId")String userId);
 
-
-	TSettleDomain updateHistoryData(@Param("departNo")String DepartNo);
 }

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

@@ -220,11 +220,8 @@ public class TSettleDomainServiceImpl extends ServiceImpl<TSettleDomainMapper, T
 				log.error(JSON.toJSONString(vo));
 				if (Common.isNotNull(tSettleDomainInfo)) {
 					baseMapper.updateById(domain);
-					baseMapper.updateHistoryData(domain.getDepartNo());
-
 				} else {
 					baseMapper.insert(domain);
-					baseMapper.updateHistoryData(domain.getDepartNo());
 				}
 			}
 			return R.ok();

yifu-archives/yifu-archives-biz/src/main/resources/mapper/TSettleDomainMapper.xml

@@ -498,7 +498,4 @@
 		and a.id in (select b.settle_id from m_setttle_customer_user b where b.user_id = #{userId}) and  a.DELETE_FLAG = '0'
 		group  by a.CUSTOMER_NO order by CREATE_TIME desc
 	</select>
-     <update id="updateHistoryData">
-		 update ekp_24a8e6a7fc143bb8c48a a,t_settle_domain b set b.FIRST_INDICATOR_BELONG = a.fd_3b1abe1f56113e_text,b.SECOND_INDICATOR_BELONG = a.fd_3b1abe1f56113e_text where a.fd_3a37fe508071fe = b.DEPART_NO
-	 </update>
 </mapper>