Merge remote-tracking branch 'origin/dev_ic_v2' into dev_ic_v2

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

@@ -156,6 +156,9 @@ public class IcPartyUnitServiceImpl extends BaseServiceImpl<IcPartyUnitDao, IcPa
         CustomerStaffInfoCacheResult staff = CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(), tokenDto.getUserId());
         entity.setAgencyId(staff.getAgencyId());
         entity.setPids(staff.getAgencyPIds());
+        if (CollectionUtils.isNotEmpty(dto.getServiceMatterList())) {
+            entity.setServiceMatter(StringUtils.join(dto.getServiceMatterList(), StrConstant.COMMA));
+        }
         if(StringUtils.isBlank(entity.getId())) {
             insert(entity);
         } else {

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartymemberStyleServiceImpl.java

@@ -45,6 +45,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -118,6 +119,12 @@ public class IcPartymemberStyleServiceImpl extends BaseServiceImpl<IcPartymember
                 e.setStyleId(entity.getId());
                 e.setImageUrl(item);
                 e.setSort(i.getAndIncrement());
+                e.setRevision(NumConstant.ZERO);
+                e.setDelFlag(NumConstant.ZERO_STR);
+                e.setCreatedBy(tokenDto.getUserId());
+                e.setUpdatedBy(tokenDto.getUserId());
+                e.setCreatedTime(new Date());
+                e.setUpdatedTime(new Date());
                 return e;
             }).collect(Collectors.toList());
             icPartymemberStyleImageService.insertBatch(list);