diff --git a/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/ClearingAccountService.java b/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/ClearingAccountService.java index efe7eae66..f289d9900 100644 --- a/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/ClearingAccountService.java +++ b/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/ClearingAccountService.java @@ -18,6 +18,7 @@ import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Service; +import org.springframework.util.StringUtils; import ru.clearing.classes.statics.data.account.Account; import ru.clearing.classes.statics.data.account.ClearingAccount; import ru.clearing.classes.statics.data.company.ClearingMemberCategory; @@ -383,7 +384,7 @@ public class ClearingAccountService extends QueueConsumer implements Initializin private synchronized Account createSdf52Account(String accountValue, String acctType, Long companyId, Long userRequestId) { { // Валидация boolean existClearingAccountTypeDictionary; - if (acctType == null) { + if (!StringUtils.hasText(acctType)) { existClearingAccountTypeDictionary = false; } else { ClearingAccountTypeDictionary catd = clearingAccountTypeDictionaryImdg.getFirstObjectByFieldValues( diff --git a/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/TradingClearingRegistryService.java b/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/TradingClearingRegistryService.java index 2d7e01aeb..4aac6a7e1 100644 --- a/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/TradingClearingRegistryService.java +++ b/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/TradingClearingRegistryService.java @@ -279,9 +279,8 @@ public class TradingClearingRegistryService extends QueueConsumer implements Ini } tradingClearingRegistry.setTradingClearingRegistryType(tradingRegistryType); - TradingClearingRegistryPurpose registryPurpose; - if (req.getDepoAccountId() != null) registryPurpose = TradingClearingRegistryPurpose.C; - else registryPurpose = TradingClearingRegistryPurpose.M; + TradingClearingRegistryPurpose registryPurpose = TradingClearingRegistryPurpose.C; + //http://jira.mfd.msk:8088/browse/CLS-631#comment-60200 tradingClearingRegistry.setTradingClearingRegistryPurpose(registryPurpose.getKey()); Company company = companyImdg.getSingleObjectByID(req.getCompanyId());