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

可信空间连接器入住接口

See merge request !14

@@ -65,49 +65,42 @@ public class TdsConnectorVerifiableRQVO {
      * 加密模块认证
      */
     @Schema(description = "加密模块认证")
-    @NotNull(message = "加密模块认证为空。")
     private JSONArray encryptionModuleAuthentication;
     
     /**
      * 软件供应链合规声明
      */
     @Schema(description = "软件供应链合规声明")
-    @NotNull(message = "软件供应链合规声明为空。")
     private JSONArray softwareScmStatemen;
     
     /**
      * 安全漏洞修复声明
      */
     @Schema(description = "安全漏洞修复声明")
-    @NotNull(message = "安全漏洞修复声明为空。")
     private JSONArray securityLoopholeRepairStatement;
     
     /**
      * 通信协议兼容性认证
      */
     @Schema(description = "通信协议兼容性认证")
-    @NotNull(message = "通信协议兼容性认证为空。")
     private JSONArray communicationProtocolCompatibilityCertification;
     
     /**
      * 硬件可信执行环境（TEE）认证
      */
     @Schema(description = "硬件可信执行环境（TEE）认证")
-    @NotNull(message = "硬件可信执行环境（TEE）认证为空。")
     private JSONArray teeCertification;
     
     /**
      * 接入行为审计合规报告
      */
     @Schema(description = "接入行为审计合规报告")
-    @NotNull(message = "接入行为审计合规报告为空。")
     private JSONArray accessAuditReport;
     
     /**
      * 第三方认证声明
      */
     @Schema(description = "第三方认证声明")
-    @NotNull(message = "第三方认证声明为空。")
     private JSONArray thirdPartyCertification;
 
     /**

@@ -292,10 +292,12 @@ public class TdsConnectorIdentityServiceImpl extends FlowAbstractImpl implements
         //驳回和撤销是，修改原来数据状态
         if(ApprovalStateEnum.REJECT.getValue().equals(bizApproveVO.getApprovalState())
                   || ApprovalStateEnum.CANCEL.getValue().equals(bizApproveVO.getApprovalState())) {
+            if("Y".equals(entity.getIsChangeData())) {
                 MfTdsConnectorIdentity sourceEntity = mfTdsConnectorIdentityService.getById(entity.getSourceBizGuid());
                 sourceEntity.setBizApproveState(ApprovalStateEnum.PASSED.getValue());
                 mfTdsConnectorIdentityService.updateById(sourceEntity);
             }
+        }
         mfTdsConnectorIdentityService.updateById(entity);
     }