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

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/HygfIcbcServiceImpl.java

@@ -318,7 +318,7 @@ public class HygfIcbcServiceImpl extends BaseService<HygfIcbcRecordDTO, HygfIcbc
     public HygfIcbcRecordDTO getObject(String amosUserId) {
         HygfIcbcRecord hygfIcbcRecord = this.lambdaQuery().eq(HygfIcbcRecord::getAmosUserId, amosUserId).last("limit 1").one();
         HygfIcbcRecordDTO hygfIcbcRecordDTO = new HygfIcbcRecordDTO();
-        if (hygfIcbcRecord == null) {
+        if (hygfIcbcRecord == null || IcbcEnum.OpenAccountState.FAIL.getCode().equals(hygfIcbcRecord.getOpenAccountStatus())) {
             PeasantHousehold peasantHousehold = peasantHouseholdService.lambdaQuery()
                                                                        .select(PeasantHousehold::getTelephone, PeasantHousehold::getOwnersName, PeasantHousehold::getIdCard)
                                                                        .eq(PeasantHousehold::getAmosUserId, amosUserId).last("limit 1").one();