From 6379b420e160b5efc0bea133de6ce659df8aaed1 Mon Sep 17 00:00:00 2001
From: zef <1146339010@QQ.com>
Date: Sat, 29 Jun 2024 14:27:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TbCompanyInformationReportingController.java      | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/ruoyi-safecompany/src/main/java/com/ruoyi/business/companyInformationReporting/controller/TbCompanyInformationReportingController.java b/ruoyi-safecompany/src/main/java/com/ruoyi/business/companyInformationReporting/controller/TbCompanyInformationReportingController.java
index 0d5e141..dc09379 100644
--- a/ruoyi-safecompany/src/main/java/com/ruoyi/business/companyInformationReporting/controller/TbCompanyInformationReportingController.java
+++ b/ruoyi-safecompany/src/main/java/com/ruoyi/business/companyInformationReporting/controller/TbCompanyInformationReportingController.java
@@ -101,8 +101,13 @@ public class TbCompanyInformationReportingController extends BaseController {
         if(tbCompanyInformationReporting.getDetails()==null||tbCompanyInformationReporting.getDetails().size()<1){
             return error("上报详情信息三项不能都为空");
         }
+        boolean sing=false;
         List<TbCompanyInformationReportingDetails> details = tbCompanyInformationReporting.getDetails();
         for (TbCompanyInformationReportingDetails detail : details) {
+            if(StringUtils.isBlank(detail.getDataType())){
+                sing=true;
+                break;
+            }
             if(tbCompanyInformationReportingDetailsService.group1FieldsEmptyByCompanyThreePreventionData(detail)){
                 tbCompanyInformationReporting.setCompanyThreePreventionData("0");
             }else {
@@ -120,8 +125,14 @@ public class TbCompanyInformationReportingController extends BaseController {
             }
             detail.setCreateTime(DateUtils.getNowDate());
         }
+        if(sing){
+            return error("上报详情类型为空");
+        }
         tbCompanyInformationReporting.setReportState("1");
         int i = tbCompanyInformationReportingService.insertTbCompanyInformationReporting(tbCompanyInformationReporting);
+        for (TbCompanyInformationReportingDetails detail : details){
+            detail.setCompanyInformationReportingId(tbCompanyInformationReporting.getId());
+        }
         boolean saveBatch = tbCompanyInformationReportingDetailsService.saveBatch(details);
         if(!saveBatch){
             i=0;