dsadsa

RMS/src/main/java/cn/cslg/report/service/business/ReportFieldOptionService.java

@@ -84,11 +84,25 @@ public class ReportFieldOptionService extends ServiceImpl<ReportFieldOptionMappe
     @Transactional
     public void addBatch(List<ReportFieldOption> optionList, Integer fieldId) {
         if (optionList.size() != 0) {
-            optionList.forEach(item -> item.setFieldId(fieldId));
+            optionList.forEach(item -> {
+                item.setFieldId(fieldId);
+                    }
+            );
             this.saveOrUpdateBatch(optionList);
         }
     }
 
+    @Transactional
+    public void addBatchs(List<ReportFieldOption> optionList, Integer fieldId) {
+        if (optionList.size() != 0) {
+            optionList.forEach(item -> {
+                        item.setFieldId(fieldId);
+                        item.setId(null);
+                    }
+            );
+            this.saveOrUpdateBatch(optionList);
+        }
+    }
     public void edit(ReportFieldOption option) {
         option.updateById();
     }

RMS/src/main/java/cn/cslg/report/service/business/ReportFieldService.java

@@ -225,7 +225,7 @@ private  final  AssoTaskPersonelService assoTaskPersonelService;
                  wrapper.eq(ReportFieldOption::getFieldId, p.getOriginId());
                 List<ReportFieldOption> reportFieldOptions =reportFieldOptionService.list(wrapper);
 
-                reportFieldOptionService.addBatch(reportFieldOptions,p.getId());
+                reportFieldOptionService.addBatchs(reportFieldOptions,p.getId());
             }
 
             if(p.getType().equals(6)){

RMS/src/main/java/cn/cslg/report/service/business/ReportFieldTreeService.java

@@ -401,7 +401,7 @@ public class ReportFieldTreeService extends ServiceImpl<ReportFieldTreeMapper, R
 
     public void addBatchs(List<ReportFieldTree> treeList, Integer fieldid) {
         if (treeList.size() != 0) {
-            treeList.forEach(ite -> ite.setFieldId(fieldid));
+            treeList.forEach(ite -> {ite.setFieldId(fieldid); ite.setId(null);});
             this.saveOrUpdateBatch(treeList);
         }
     }