Merge remote-tracking branch 'origin/release_gdghg' into release_gdghg

src/main/java/cn/com/poc/ai_data_audit/rest/impl/DataAuditRestImpl.java

@@ -36,7 +36,7 @@ public class DataAuditRestImpl implements DataAuditRest {
 
     @Override
     public void createDataAuditTask(FileUploadConfirmDto fileUploadConfirmDto) throws Exception {
-        String taskName = "Task" + RandomUtil.produceString(4);
+        String taskName = "Task-" + RandomUtil.produceStringAndNumber(6);
         bizAiDataAuditTaskService.createDataAuditTask(taskName, fileUploadConfirmDto);
     }
 

src/main/java/cn/com/poc/message/service/impl/AirportConsumerServiceImpl.java

@@ -172,8 +172,10 @@ public class AirportConsumerServiceImpl implements AirportConsumerService {
                 throw new BusinessException("找不到该任务下的文件");
             }
 
+
             //获取所有的规则
             AiDataAuditRuleQueryCondition aiDataAuditRuleQueryCondition = new AiDataAuditRuleQueryCondition();
+            aiDataAuditRuleQueryCondition.setIsDeleted("N");
             List<AiDataAuditRuleQueryItem> aiDataAuditRuleQueryItems = bizAiDataAuditRuleService.aiDataAuditRuleQueryItemList(aiDataAuditRuleQueryCondition, null);
             CountDownLatch countDownLatch = new CountDownLatch(aiDataAuditRuleQueryItems.size());