联建活动添加网格

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/LatestActInfoEntity.java

@@ -43,7 +43,7 @@ public class LatestActInfoEntity extends BaseEpmetEntity {
      * 客户id
      */
 	private String customerId;
-
+	private String gridId;
     /**
      * 活动标题
      */

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

@@ -18,6 +18,7 @@ import com.epmet.dto.result.work.*;
 import com.epmet.entity.LatestActServiceRelationEntity;
 import com.epmet.entity.LatestActUnitRelationEntity;
 import com.epmet.service.*;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -133,6 +134,7 @@ public class WorkActDraftServiceImpl implements WorkActDraftService {
 
         //保存活动与服务关系
         latestActServiceRelationService.deleteByAct(actDraftId);
+        if (CollectionUtils.isNotEmpty(formDTO.getServiceMatterList())) {
             AtomicInteger i = new AtomicInteger(NumConstant.ONE);
             List<LatestActServiceRelationEntity> serviceList = formDTO.getServiceMatterList().stream().map(service -> {
                 LatestActServiceRelationEntity entity = new LatestActServiceRelationEntity();
@@ -143,9 +145,10 @@ public class WorkActDraftServiceImpl implements WorkActDraftService {
                 return entity;
             }).collect(Collectors.toList());
             latestActServiceRelationService.insertBatch(serviceList);
-
+        }
         //保存活动与单位关系
         latestActUnitRelationService.deleteByAct(actDraftId);
+        if (CollectionUtils.isNotEmpty(formDTO.getServiceMatterList())) {
             AtomicInteger j = new AtomicInteger(NumConstant.ONE);
             List<LatestActUnitRelationEntity> unitList = formDTO.getUnitIdList().stream().map(unitId -> {
                 LatestActUnitRelationEntity entity = new LatestActUnitRelationEntity();
@@ -156,6 +159,7 @@ public class WorkActDraftServiceImpl implements WorkActDraftService {
                 return entity;
             }).collect(Collectors.toList());
             latestActUnitRelationService.insertBatch(unitList);
+        }
         return resultDTO;
     }