可信空间连接器入住接口

xu
Showing 1 changed file with 2 additions and 3 deletions
src/main/java/com/csbr/qingcloud/portal/service/impl/TdsConnectorIdentityManagementServiceImpl.java
--- a/src/main/java/com/csbr/qingcloud/portal/service/impl/TdsConnectorIdentityManagementServiceImpl.java
View file @f67e71d
+++ b/src/main/java/com/csbr/qingcloud/portal/service/impl/TdsConnectorIdentityManagementServiceImpl.java
View file @f67e71d
@@ -374,15 +374,14 @@ public class TdsConnectorIdentityManagementServiceImpl extends FlowAbstractImpl 
        if(StringUtils.isNotBlank(rqVO.getGuid())){
            queryWrapper.ne(MfTdsConnectorIdentityManagement::getGuid,rqVO.getGuid());
        }
-        //排除驳回、撤回的数据
-        queryWrapper.notIn(MfTdsConnectorIdentityManagement::getCrossPlatformApproveState,ApprovalStateEnum.CANCEL.getValue(),
-                  ApprovalStateEnum.REJECT.getValue(),ApprovalStateEnum.DISABLE.getValue());
        //根据使用场景查询
        queryWrapper.eq(MfTdsConnectorIdentityManagement::getConnectorGuid,rqVO.getConnectorGuid());
        queryWrapper.eq(MfTdsConnectorIdentityManagement::getUseScenariosCode,rqVO.getUseScenariosCode());
        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
        //期望效期有效的
        queryWrapper.ge(MfTdsConnectorIdentityManagement::getExpirationTime,sdf.format(new Date()));
+        //排除驳回、撤回的数据
+        queryWrapper.and(wraper->wraper.apply("ifnull(cross_platform_approve_state,biz_approve_state) in ('A','Y')"));
        if(mfTdsConnectorIdentityManagementService.count(queryWrapper)>0){
            throw new CsbrSystemException(SystemError.DATA_ALREADY_EXISTS,"该连接器的使用场景已经存在。");
        }