Skip to content

csbr-daop / ms-data-circulation-portal-service

Go to a project
Toggle navigation
Toggle navigation pinning
95ff4f9c by xu
Options

Merge branch 'feature-tds-v1.0.0' into 'develop' 

可信空间连接器入住接口

See merge request !19
2 parents 57847a98 f8f33bb6
Inline Side-by-side
Showing 1 changed file with 4 additions and 1 deletions
src/main/java/com/csbr/qingcloud/portal/service/impl/TdsConnectorIdentityServiceImpl.java
......@@ -155,7 +155,9 @@ public class TdsConnectorIdentityServiceImpl extends FlowAbstractImpl implements
beforeSave(rqVO);
MfTdsConnectorIdentity entity = convertToEntity(rqVO);
rqVO.setGuid(entity.getGuid());
if(StringUtils.isBlank(rqVO.getSourceBizGuid()) && flowBaseVO.getImmediateApprove()) {
if(StringUtils.isBlank(rqVO.getSourceBizGuid())
&& StringUtils.isBlank(rqVO.getConnectorIdentity())
&& flowBaseVO.getImmediateApprove()) {
entity.setConnectorIdentity(IdentificationCodeUtil.genConnectorCode(entity.getLegalSocialCreditCode(), IdentificationCodeUtil.medIndustry));
}
mfTdsConnectorIdentityService.csbrAddEntity(entity);
......@@ -214,6 +216,7 @@ public class TdsConnectorIdentityServiceImpl extends FlowAbstractImpl implements
beforeUpdate(rqVO);
MfTdsConnectorIdentity oldEntity = mfTdsConnectorIdentityService.getById(rqVO.getGuid());
MfTdsConnectorIdentity entity = convertToEntity(rqVO);
rqVO.setConnectorIdentity(oldEntity.getConnectorIdentity());
if("N".equals(oldEntity.getIsChangeData()) && StringUtils.isBlank(oldEntity.getConnectorIdentity())
&& flowBaseVO.getImmediateApprove()) {
entity.setConnectorIdentity(IdentificationCodeUtil.genConnectorCode(entity.getLegalSocialCreditCode(), IdentificationCodeUtil.medIndustry));
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!