联建活动关联多个单位和服务事项修改

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActServiceImpl.java

@@ -1516,10 +1516,10 @@ public class WorkActServiceImpl implements WorkActService {
                 AtomicInteger i = new AtomicInteger(NumConstant.ONE);
                 List<IcActivityUnitRelationEntity> unitRelationList = rePublishFormDTO.getUnitIdList().stream().map(unitId -> {
                     IcActivityUnitRelationEntity relation = new IcActivityUnitRelationEntity();
-                    relation.setCustomerId(activity.getCustomerId());
-                    relation.setAgencyId(activity.getAgencyId());
-                    relation.setPids(activity.getPids());
-                    relation.setActivityId(activity.getId());
+                    relation.setCustomerId(activityDTO.getCustomerId());
+                    relation.setAgencyId(activityDTO.getAgencyId());
+                    relation.setPids(activityDTO.getPids());
+                    relation.setActivityId(activityDTO.getId());
                     relation.setUnitId(unitId);
                     relation.setSort(i.getAndIncrement());
                     return relation;
@@ -1531,10 +1531,10 @@ public class WorkActServiceImpl implements WorkActService {
                 AtomicInteger j = new AtomicInteger(NumConstant.ONE);
                 List<IcActivityServiceRelationEntity> serviceRelationList = rePublishFormDTO.getServiceMatterList().stream().map(service -> {
                     IcActivityServiceRelationEntity relation = new IcActivityServiceRelationEntity();
-                    relation.setCustomerId(activity.getCustomerId());
-                    relation.setAgencyId(activity.getAgencyId());
-                    relation.setPids(activity.getPids());
-                    relation.setActivityId(activity.getId());
+                    relation.setCustomerId(activityDTO.getCustomerId());
+                    relation.setAgencyId(activityDTO.getAgencyId());
+                    relation.setPids(activityDTO.getPids());
+                    relation.setActivityId(activityDTO.getId());
                     relation.setServiceMatter(service);
                     relation.setSort(j.getAndIncrement());
                     return relation;