From 818ef541fa9507631df3b82136fca8b6ee5e3e6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <liangqitao@syxysoft.com>
Date: Wed, 31 Jul 2024 18:19:50 +0800
Subject: [PATCH] fix:87310

---
 .../LawsMarketStandardDetailServiceImpl.java  | 21 ++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardDetailServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardDetailServiceImpl.java
index 72e5e51f..1e6ffe88 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardDetailServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardDetailServiceImpl.java
@@ -458,6 +458,10 @@ public class LawsMarketStandardDetailServiceImpl extends ServiceImpl<LawsMarketS
         if(Objects.isNull(lawsMarketStandard)){
             return Result.error(ResultCommon.NO_CORRESPONDING_DATA_FOUND);
         }
+        LawsMarketStandard lawsMarketStandardOld = marketStandardService.getById(oldId);
+        if(Objects.isNull(lawsMarketStandardOld)){
+            return Result.error(ResultCommon.NO_CORRESPONDING_DATA_FOUND);
+        }
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         if(!Arrays.asList(sysUser.getRoleIds().split(",")).contains(lawsAdmin)
                 && !Arrays.stream(sysUser.getRoleIds().split(",")).anyMatch(otherAdmin::contains)
@@ -482,11 +486,26 @@ public class LawsMarketStandardDetailServiceImpl extends ServiceImpl<LawsMarketS
         if(CollectionUtils.isEmpty(listOld)){
             return Result.error(ResultCommon.NO_CORRESPONDING_DATA_FOUND);
         }
-        setData(newId, listOld);
+        // 国家地区拼接
+        String allCountry = lawsMarketStandard.getCountry() + "," + lawsMarketStandardOld.getCountry();
+        List<String> listAllCountry = Arrays.stream(allCountry.split(",")).distinct().collect(Collectors.toList());
+        setDataByCopy(newId, listOld,String.join(",",listAllCountry));
         saveBatch(listOld);
         return Result.OK(ResultCommon.OK);
     }
 
+    private void setDataByCopy(String newId, List<LawsMarketStandardDetail> listOld,String country) {
+        for (LawsMarketStandardDetail lawsMarketStandardDetail : listOld) {
+            lawsMarketStandardDetail.setId(null);
+            lawsMarketStandardDetail.setCreateBy(null);
+            lawsMarketStandardDetail.setCreateTime(null);
+            lawsMarketStandardDetail.setUpdateBy(null);
+            lawsMarketStandardDetail.setUpdateTime(null);
+            lawsMarketStandardDetail.setManifestId(newId);
+            lawsMarketStandardDetail.setCountry(country);
+        }
+    }
+
     private void setData(String newId, List<LawsMarketStandardDetail> listOld) {
         for (LawsMarketStandardDetail lawsMarketStandardDetail : listOld) {
             lawsMarketStandardDetail.setId(null);