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

可信空间连接器入住接口

See merge request !18

@@ -155,7 +155,7 @@ public class TdsConnectorIdentityServiceImpl extends FlowAbstractImpl implements
         beforeSave(rqVO);
         beforeSave(rqVO);
         MfTdsConnectorIdentity entity = convertToEntity(rqVO);
         MfTdsConnectorIdentity entity = convertToEntity(rqVO);
         rqVO.setGuid(entity.getGuid());
         rqVO.setGuid(entity.getGuid());
-        if("N".equals(entity.getIsChangeData()) && flowBaseVO.getImmediateApprove()) {
+        if(StringUtils.isBlank(rqVO.getSourceBizGuid()) && flowBaseVO.getImmediateApprove()) {
             entity.setConnectorIdentity(IdentificationCodeUtil.genConnectorCode(entity.getLegalSocialCreditCode(), IdentificationCodeUtil.medIndustry));
             entity.setConnectorIdentity(IdentificationCodeUtil.genConnectorCode(entity.getLegalSocialCreditCode(), IdentificationCodeUtil.medIndustry));
         }
         }
         mfTdsConnectorIdentityService.csbrAddEntity(entity);
         mfTdsConnectorIdentityService.csbrAddEntity(entity);
@@ -214,7 +214,7 @@ public class TdsConnectorIdentityServiceImpl extends FlowAbstractImpl implements
         beforeUpdate(rqVO);
         beforeUpdate(rqVO);
         MfTdsConnectorIdentity oldEntity = mfTdsConnectorIdentityService.getById(rqVO.getGuid());
         MfTdsConnectorIdentity oldEntity = mfTdsConnectorIdentityService.getById(rqVO.getGuid());
         MfTdsConnectorIdentity entity = convertToEntity(rqVO);
         MfTdsConnectorIdentity entity = convertToEntity(rqVO);
-        if("N".equals(entity.getIsChangeData()) && StringUtils.isBlank(entity.getConnectorIdentity())
+        if("N".equals(oldEntity.getIsChangeData()) && StringUtils.isBlank(oldEntity.getConnectorIdentity())
                   && flowBaseVO.getImmediateApprove()) {
                   && flowBaseVO.getImmediateApprove()) {
             entity.setConnectorIdentity(IdentificationCodeUtil.genConnectorCode(entity.getLegalSocialCreditCode(), IdentificationCodeUtil.medIndustry));
             entity.setConnectorIdentity(IdentificationCodeUtil.genConnectorCode(entity.getLegalSocialCreditCode(), IdentificationCodeUtil.medIndustry));
         }
         }