Merge remote-tracking branch 'origin/duhanyu'

ruoyi-admin/src/main/java/com/ruoyi/tc/controller/AssetCurrentController.java

@@ -178,11 +178,13 @@ public class AssetCurrentController extends BaseController {
         unitOtherConcatService.deleteByAssetIds(assetCurrent.getId());
         if (assetCurrent.getXjgywxt() != null) {
             assetCurrent.getXjgywxt().setAssetId(assetCurrent.getId());
+            assetCurrent.getXjgywxt().setId(null);
             assetBusinessFormService.save(assetCurrent.getXjgywxt());
         }
         if (!assetCurrent.getGylxxList().isEmpty()) {
             for (AssetSupplyChain items : assetCurrent.getGylxxList()) {
                 items.setAssetId(assetCurrent.getId());
+                items.setId(null);
             }
             //新增供应链
             assetSupplyChainService.saveBatch(assetCurrent.getGylxxList());
@@ -190,6 +192,7 @@ public class AssetCurrentController extends BaseController {
         if (!assetCurrent.getJcwlList().isEmpty()) {
             for (AssetBasicNetwork items : assetCurrent.getJcwlList()) {
                 items.setAssetId(assetCurrent.getId());
+                items.setId(null);
             }
             //新增基础网络
             assetBasicNetworkService.saveBatch(assetCurrent.getJcwlList());
@@ -197,6 +200,7 @@ public class AssetCurrentController extends BaseController {
         if (!assetCurrent.getOtherConcat().isEmpty()) {
             for (UnitOtherConcat items : assetCurrent.getOtherConcat()) {
                 items.setAssetId(assetCurrent.getId());
+                items.setConcatId(null);
             }
             //新增其他联系人
             unitOtherConcatService.saveBatch(assetCurrent.getOtherConcat());

ruoyi-admin/src/main/java/com/ruoyi/tc/controller/UnitController.java

@@ -157,12 +157,14 @@ public class UnitController {
         if(!x.getOtherConcat().isEmpty()){
             x.getOtherConcat().forEach(y->{
                 y.setUnitId(x.getId());
+                y.setConcatId(null);
             });
             unitOtherConcatService.saveBatch(x.getOtherConcat());
         }
         if(!x.getJcxxList().isEmpty()){
             x.getJcxxList().forEach(y->{
                 y.setUnitId(x.getId());
+                y.setJcid(null);
             });
             examineInfoService.saveBatch(x.getJcxxList());
         }