|
@@ -124,7 +124,7 @@ public class EnterpriseServiceImpl implements EnterpriseService {
|
|
|
loginUser.getCustomerUser().getXtUid());
|
|
|
enterpriseStatusDto.setShowTaxRebateApplyMenu(enterprise != null && getShowTaxRebateApplyMenu(enterprise));
|
|
|
enterpriseStatusDto.setShowApplyTaxRebateBtn(
|
|
|
- enterprise != null && !validityPeriod && getShowApplyTaxRebateBtn(enterprise));
|
|
|
+ enterprise != null && (!validityPeriod || getShowApplyTaxRebateBtn(enterprise)));
|
|
|
enterpriseStatusDto
|
|
|
.setShowTaxRebateBtn(enterprise != null && validityPeriod && getShowTaxRebateBtn(enterprise));
|
|
|
return enterpriseStatusDto;
|
|
@@ -307,7 +307,7 @@ public class EnterpriseServiceImpl implements EnterpriseService {
|
|
|
|
|
|
@NotNull
|
|
|
private ContractGenInputItem getAuthFileGenInputItem(EnterpriseDto enterpriseDto,
|
|
|
- EnterpriseRelatedPersonDto legalPerson, EnterpriseRelatedPersonDto authorizedPerson) {
|
|
|
+ EnterpriseRelatedPersonDto legalPerson, EnterpriseRelatedPersonDto authorizedPerson) {
|
|
|
ContractGenInputItem inputItem = new ContractGenInputItem();
|
|
|
inputItem.setTemplateCode(FileTypeEnum.AUTHORIZATION_FILE.getCode());
|
|
|
inputItem.setContractName("授权委托书-跨境通");
|
|
@@ -324,7 +324,7 @@ public class EnterpriseServiceImpl implements EnterpriseService {
|
|
|
|
|
|
@NotNull
|
|
|
private ContractSignInput getAuthFileSignInput(String enterpriseName, String EnterpriseCertNo,
|
|
|
- EnterpriseRelatedPersonDto legalPerson, Long fileId) {
|
|
|
+ EnterpriseRelatedPersonDto legalPerson, Long fileId) {
|
|
|
ContractSignInput signInput = new ContractSignInput();
|
|
|
signInput.setBizScene("跨境通-授权委托书");
|
|
|
signInput.setBizType(ContractConstant.SIGN_BIZ_TYPE_AUTHORIZATION_LETTER);
|