添加customerId

5 years ago · f86d92acf5
23 changed files with 62 additions and 8 deletions
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenGrassrootsGovernDataAbsorptionServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenGrassrootsGovernDataAbsorptionServiceImpl.java
@ -185,7 +185,9 @@ public class ScreenGrassrootsGovernDataAbsorptionServiceImpl implements ScreenGr
        imgMap.values().forEach(list -> {imgList.addAll(list);});

        difficulties.removeIf( diff -> StringUtils.isBlank(diff.getLatestOperateDesc()));
-
+        imgList.forEach(item -> {
+            item.setCustomerId(param.getCustomerId());
+        });
        screenDifficultyDataService.dataClean(param.getCustomerId(),difficulties,imgList);
        log.info("【大屏数据抽取-难点赌点执行完毕】 客户Id{} 难点赌点数据{}",param.getCustomerId(),JSON.toJSONString(difficulties));
    }
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ShiBeiScreenCollServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ShiBeiScreenCollServiceImpl.java
@ -33,6 +33,7 @@ import com.epmet.entity.evaluationindex.screen.ScreenCustomerAgencyEntity;
 import com.epmet.entity.evaluationindex.screen.ScreenCustomerBizOrgEntity;
 import com.epmet.entity.evaluationindex.screen.ScreenEventImgDataEntity;
 import com.epmet.entity.evaluationindex.screen.ScreenUserJoinEntity;
+import com.epmet.service.evaluationindex.screen.ScreenEventImgDataService;
 import com.epmet.service.evaluationindex.screen.ShiBeiScreenCollService;
 import org.apache.commons.collections4.ListUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@ -94,6 +95,8 @@ public class ShiBeiScreenCollServiceImpl implements ShiBeiScreenCollService {
    private ScreenIndexDataYearlyDao screenIndexDataYearlyDao;
    @Autowired
    private ScreenPublicPartiTotalDataDao screenPublicPartiTotalDataDao;
+    @Autowired
+    private ScreenEventImgDataService screenEventImgDataService;

    @DataSource(value = DataSourceConstant.EVALUATION_INDEX, datasourceNameFromArg = true)
    @Override
@ -194,6 +197,7 @@ public class ShiBeiScreenCollServiceImpl implements ShiBeiScreenCollService {
                    for (int j = NumConstant.ZERO; j < formDTO.getDataList().get(i).getImgDataList().size(); j++) {
                        // 新增 中央区-事件数据图片数据 表
                        ScreenEventImgDataEntity imgDataEntity = new ScreenEventImgDataEntity();
+                        imgDataEntity.setCustomerId(customerId);
                        imgDataEntity.setEventId(formDTO.getDataList().get(i).getImgDataList().get(j).getEventId());
                        imgDataEntity.setEventImgUrl(formDTO.getDataList().get(i).getImgDataList().get(j).getImgUrl());
                        imgDataEntity.setSort(formDTO.getDataList().get(i).getImgDataList().get(j).getSort());
@ -205,6 +209,7 @@ public class ShiBeiScreenCollServiceImpl implements ShiBeiScreenCollService {
            if (isImgUrl) {
                screenEventImgDataDao.delEventImgDataByEvent(events);
                screenEventImgDataDao.batchInsertEventImgData(eventImgDataList);
+//                screenEventImgDataService.insertBatch(eventImgDataList);
            }

        }
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenDifficultyDataDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenDifficultyDataDao.xml
@ -193,6 +193,7 @@
        insert into screen_difficulty_img_data
        (
        ID,
+        CUSTOMER_ID,
        EVENT_ID,
        EVENT_IMG_URL,
        SORT,
@ -206,6 +207,7 @@
        <foreach collection="list" item="item" index="index" separator=",">
            (
            (SELECT REPLACE(UUID(), '-', '') AS id),
+            #{item.customerId},
            #{item.eventId},
            #{item.eventImgUrl},
            #{item.sort},
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenEventImgDataDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenEventImgDataDao.xml
@ -16,6 +16,7 @@
        insert into screen_event_img_data
        (
        ID,
+        CUSTOMER_ID,
        EVENT_ID,
        EVENT_IMG_URL,
        SORT,
@ -29,6 +30,7 @@
        <foreach collection="list" item="item" index="index" separator=",">
            (
            (SELECT REPLACE(UUID(), '-', '') AS id),
+            #{item.customerId},
            #{item.eventId},
            #{item.eventImgUrl},
            #{item.sort},
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActLiveRecServiceImpl.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActLiveRecServiceImpl.java
@ -152,6 +152,7 @@ public class ActLiveRecServiceImpl extends BaseServiceImpl<ActLiveRecDao, ActLiv
        // 存储活动实况记录表
        String uuid = UUID.randomUUID().toString().replaceAll("-","");
        formDTO.setId(uuid);
+        formDTO.setCustomerId(tokenDto.getCustomerId());
        baseDao.insertActLiveRec(formDTO);

        //存储活动实况图片
@ -163,6 +164,7 @@ public class ActLiveRecServiceImpl extends BaseServiceImpl<ActLiveRecDao, ActLiv
                actLivePicEntity.setLiveId(uuid);
                actLivePicEntity.setPicUrl(imgUrl);
                actLivePicEntity.setSort(i + NumConstant.ONE);
+                actLivePicEntity.setCustomerId(tokenDto.getCustomerId());
                actLivePicDao.insert(actLivePicEntity);
            }
        }
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActSignInRecServiceImpl.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActSignInRecServiceImpl.java
@ -106,6 +106,7 @@ public class ActSignInRecServiceImpl extends BaseServiceImpl<ActSignInRecDao, Ac
        // 存储活动签到记录表
        String uuid = UUID.randomUUID().toString().replaceAll("-","");
        dto.setId(uuid);
+        dto.setCustomerId(tokenDto.getCustomerId());
        baseDao.insertActSignInRec(dto);

        //存储活动签到图片
@ -117,6 +118,7 @@ public class ActSignInRecServiceImpl extends BaseServiceImpl<ActSignInRecDao, Ac
                actLivePicEntity.setSignInId(uuid);
                actLivePicEntity.setPicUrl(imgUrl);
                actLivePicEntity.setSort(i + NumConstant.ONE);
+                actLivePicEntity.setCustomerId(formDTO.getCustomerId());
                actSignInPicDao.insert(actLivePicEntity);
            }
        }
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActLiveRecDao.xml
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActLiveRecDao.xml
@ -53,6 +53,7 @@
    <insert id="insertActLiveRec" parameterType="com.epmet.dto.form.resi.ResiActInsertLiveFormDTO">
        INSERT INTO act_live_rec (
           ID,
+           CUSTOMER_ID,
           ACT_ID,
           USER_ID,
           LONGITUDE,
@ -67,6 +68,7 @@
           UPDATED_TIME)
           VALUES
       ( #{id},
+         #{customerId},
         #{actId},
         #{userId},
         #{longitude},
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActSignInRecDao.xml
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActSignInRecDao.xml
@ -24,6 +24,7 @@
    <insert id="insertActSignInRec" parameterType="com.epmet.dto.ActSignInRecDTO">
        INSERT INTO act_sign_in_rec (
           ID,
+           CUSTOMER_ID,
           ACT_ID,
           USER_ID,
           LONGITUDE,
@ -40,6 +41,7 @@
           UPDATED_TIME)
           VALUES
       ( #{id},
+         #{customerId},
         #{actId},
         #{userId},
         #{longitude},
--- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/IssuesToBeCountedResultDTO.java
+++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/IssuesToBeCountedResultDTO.java
@ -18,6 +18,8 @@ public class IssuesToBeCountedResultDTO implements Serializable {
     * */
    private String issueId;

+    private String customerId;
+
    /**
     * 议题状态
     * */
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProcessServiceImpl.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProcessServiceImpl.java
@ -124,7 +124,8 @@ public class IssueProcessServiceImpl extends BaseServiceImpl<IssueProcessDao, Is
    @Override
    @Transactional(rollbackFor = Exception.class)
    public int insertOne(IssueProcessDTO issueProcessDTO) {
-        return baseDao.insertOne(issueProcessDTO);
+        IssueProcessEntity entity = ConvertUtils.sourceToTarget(issueProcessDTO, IssueProcessEntity.class);
+        return baseDao.insert(entity);
    }

    /**
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java
@ -256,6 +256,7 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp

            //2.新增议题流程
            IssueProcessDTO issueProcessDTO = new IssueProcessDTO();
+            issueProcessDTO.setCustomerId(issueShiftedFromTopicFormDTO.getCustomerId());
            issueProcessDTO.setIssueId(issueDTO.getId());
            issueProcessDTO.setIssueStatus(ModuleConstants.ISSUE_STATUS_VOTING);
            issueProcessDTO.setOrgType(ModuleConstants.ISSUE_PROCESS_ORG_TYPE_GRID);
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalDailyServiceImpl.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalDailyServiceImpl.java
@ -161,6 +161,7 @@ public class IssueVoteStatisticalDailyServiceImpl extends BaseServiceImpl<IssueV
                        baseDao.getDailyStatisticalCountByIssueIdAndStatisticalDate(dailyStatisticalToUpdate);

                for(IssuesToBeCountedResultDTO o : value){
+                    dailyStatisticalToUpdate.setCustomerId(o.getCustomerId());
                    //o的attitudeUpToYesterday有三种值:opposition 、 support 、 null
                    //当o的attitudeUpToYesterday为null时，List中只有一条
                    //当o的attitudeUpToYesterday不为null时，List中可能存在一条或者两条
@ -292,7 +293,7 @@ public class IssueVoteStatisticalDailyServiceImpl extends BaseServiceImpl<IssueV
            }
        });
        if(dailyListToInsert.size() > NumConstant.ZERO){
-            baseDao.insertBatch(dailyListToInsert);
+            insertBatch(dailyListToInsert);
        }
        if(dailyListToUpdate.size() > NumConstant.ZERO){
            baseDao.updateBatch(dailyListToUpdate);
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java
@ -51,12 +51,12 @@ import com.epmet.resi.group.feign.ResiGroupOpenFeignClient;
 import com.epmet.service.IssueVoteDetailService;
 import com.epmet.service.IssueVoteStatisticalService;
 import com.epmet.utils.ModuleConstants;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.CollectionUtils;

 import java.time.LocalDate;
 import java.time.LocalDateTime;
@ -376,7 +376,11 @@ public class IssueVoteStatisticalServiceImpl extends BaseServiceImpl<IssueVoteSt


                    // 批量插入
-                    baseDao.insertBatch(summary);
+                    if(CollectionUtils.isNotEmpty(summary)) {
+                        List<IssueVoteStatisticalEntity> issueVoteStatisticalEntityList = ConvertUtils.sourceToTarget(summary,
+                                IssueVoteStatisticalEntity.class);
+                        insertBatch(issueVoteStatisticalEntityList);
+                    }
                }
            }
         else if (ids.size() < statisiticalIds.size()) {
@ -407,8 +411,9 @@ public class IssueVoteStatisticalServiceImpl extends BaseServiceImpl<IssueVoteSt
        //根据ids去缓存中取值
        List<IssueVoteStatisticalDTO> listToAdd = new ArrayList<>();
        setVotableCountsAndUpdateCache(listToAdd,issues,votableCountMap);
+        List<IssueVoteStatisticalEntity> issueVoteStatisticalEntityList = ConvertUtils.sourceToTarget(listToAdd, IssueVoteStatisticalEntity.class);
         //  批量新增listToAdd
-         baseDao.insertBatch(listToAdd);
+         insertBatch(issueVoteStatisticalEntityList);
    }


--- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueVoteStatisticalDailyDao.xml
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueVoteStatisticalDailyDao.xml
@ -28,6 +28,7 @@
        SELECT
        issue.ID AS ISSUE_ID,
        issue.ISSUE_STATUS,
+        issue.CUSTOMER_ID,
        vote.ATTITUDE,
        IFNULL(vote.VOTE_COUNT,0)AS VOTE_COUNT,
        totalvote.ATTITUDE AS ATTITUDE_UP_TO_YESTERDAY,
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
@ -1282,6 +1282,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 							ProjectOrgRelationDTO relation = ConvertUtils.sourceToTarget(period,ProjectOrgRelationDTO.class);
 							relation.setFirstDealtDate(period.getPeriodTillReplyFirstly());
 							relation.setSourceOperation(period.getLastAction());
+							relation.setCustomerId(customerId);
 							return relation;
 						}).collect(Collectors.toList());
 						totalContainer.addAll(formatted);
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectOrgRelationDao.xml
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectOrgRelationDao.xml
@ -50,6 +50,7 @@
    <insert id="insertBatch" parameterType="java.util.List">
        INSERT INTO project_org_relation(
            ID,
+            CUSTOMER_ID,
            PROJECT_STAFF_ID,
            INFORMED_DATE,
            CREATED_TIME,
@ -61,6 +62,7 @@
        <foreach collection="list" item="item" index="index" separator=",">
            (
            (SELECT REPLACE(UUID(),'-','') as id),
+            #{item.customerId},
            #{item.projectStaffId},
            <choose>
                <when test="null == item.informedDate">
@ -108,6 +110,7 @@
        <!-- 批量插入 -->
        INSERT INTO project_org_relation(
        ID,
+        CUSTOMER_ID,
        PROJECT_STAFF_ID,
        INFORMED_DATE,
        HANDLED_DATE,
@ -124,6 +127,7 @@
        <foreach collection="list" item="item" index="index" separator=",">
            (
            (SELECT REPLACE(UUID(),'-','') as id),
+            #{item.customerId},
            #{item.projectStaffId},
            #{item.informedDate},
            #{item.handledDate},
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/ResiTopicTurnIssueFromDTO.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/ResiTopicTurnIssueFromDTO.java
@ -48,4 +48,6 @@ public class ResiTopicTurnIssueFromDTO implements Serializable {

    private String actionType;

+    private String customerId;
+
 }
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/ResiTopicController.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/ResiTopicController.java
@ -241,6 +241,7 @@ public class ResiTopicController {
    @PostMapping("turnintoissue")
    public Result turnIntoIssue(@LoginUser TokenDto tokenDto,@RequestBody ResiTopicTurnIssueFromDTO topicTurnIssueFromDTO){
        topicTurnIssueFromDTO.setUserId(tokenDto.getUserId());
+        topicTurnIssueFromDTO.setCustomerId(tokenDto.getCustomerId());
        ValidatorUtils.validateEntity(topicTurnIssueFromDTO);
        topicService.shiftIssue(topicTurnIssueFromDTO);
        return new Result();
@ -256,6 +257,7 @@ public class ResiTopicController {
    @PostMapping("turnintoissuev2")
    public Result<FirstTopicShiftedToIssueApplicationResultDTO> turnIntoIssueV2(@LoginUser TokenDto tokenDto, @RequestBody ResiTopicTurnIssueFromDTO topicTurnIssueFromDTO){
        topicTurnIssueFromDTO.setUserId(tokenDto.getUserId());
+        topicTurnIssueFromDTO.setCustomerId(tokenDto.getCustomerId());
        ValidatorUtils.validateEntity(topicTurnIssueFromDTO);
        return new Result<FirstTopicShiftedToIssueApplicationResultDTO>().ok(topicService.shiftIssueV2(topicTurnIssueFromDTO));
    }
@ -271,6 +273,7 @@ public class ResiTopicController {
    @PostMapping("editissueapplication")
    public Result<FirstTopicShiftedToIssueApplicationResultDTO> editIssueApplication(@LoginUser TokenDto tokenDto, @RequestBody ResiTopicTurnIssueFromDTO param){
        param.setUserId(tokenDto.getUserId());
+        param.setCustomerId(tokenDto.getCustomerId());
        ValidatorUtils.validateEntity(param);
        return new Result<FirstTopicShiftedToIssueApplicationResultDTO>().ok(topicService.shiftIssueV2(param));
    }
@ -283,7 +286,9 @@ public class ResiTopicController {
     * @date 2020.11.23 03:08
    */
    @PostMapping("fetchtopicinfowhenauditissue")
-    public Result<IssueShiftedFromTopicFormDTO> fetchTopicInfoWhenAuditIssue(@RequestBody ResiTopicTurnIssueFromDTO param){
+    public Result<IssueShiftedFromTopicFormDTO> fetchTopicInfoWhenAuditIssue(@LoginUser TokenDto tokenDto,
+                                                                             @RequestBody ResiTopicTurnIssueFromDTO param){
+        param.setCustomerId(tokenDto.getCustomerId());
        return new Result<IssueShiftedFromTopicFormDTO>().ok(topicService.getIssueInfoWhenAudit(param));
    }

--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicCommentServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicCommentServiceImpl.java
@ -237,7 +237,7 @@ public class ResiTopicCommentServiceImpl extends BaseServiceImpl<ResiTopicCommen
        comment.setCreatedBy(tokenDto.getUserId());
        //2021/1/29  客户Id
        comment.setCustomerId(loginUserUtil.getLoginUserCustomerId());
-        baseDao.insertOne(comment);
+        baseDao.insert(comment);
        // 话题评论前3次，加积分【对小组内话题进行15字以上评论】
        Integer commentCount = baseDao.selectCommentCountByUserId(tokenDto.getUserId());
        if (null == commentCount || commentCount <= NumConstant.THREE){
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java
@ -1490,6 +1490,7 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
                operation.setCreatedTime(now);
                operation.setCreatedBy(topicTurnIssueFromDTO.getUserId());
                operation.setTopicId(topicTurnIssueFromDTO.getTopicId());
+                operation.setCustomerId(topicTurnIssueFromDTO.getCustomerId());
                operation.setOperationType(ModuleConstant.TOPIC_OPERATION_TYPE_SHIFT_ISSUE);
                int operationResult = resiTopicOperationDao.insertOneByParams(operation);
                if (operationResult != NumConstant.ONE) {
@ -1607,6 +1608,7 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
                    operation.setCreatedBy(topicTurnIssueFromDTO.getUserId());
                    operation.setTopicId(topicTurnIssueFromDTO.getTopicId());
                    operation.setOperationType(ModuleConstant.TOPIC_OPERATION_TYPE_SHIFT_ISSUE);
+                    operation.setCustomerId(topicTurnIssueFromDTO.getCustomerId());
                    int operationResult = resiTopicOperationDao.insertOneByParams(operation);
                    if (operationResult != NumConstant.ONE) {
                        logger.warn(ModuleConstant.FAILURE_TO_ADD_TOPIC_OPERATION);
@ -1741,6 +1743,7 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
            operation.setCreatedBy(param.getUserId());
            operation.setTopicId(param.getTopicId());
            operation.setOperationType(ModuleConstant.TOPIC_OPERATION_TYPE_SHIFT_ISSUE);
+            operation.setCustomerId(param.getCustomerId());
            int operationResult = resiTopicOperationDao.insertOneByParams(operation);
            if (operationResult != NumConstant.ONE) {
                logger.warn(ModuleConstant.FAILURE_TO_ADD_TOPIC_OPERATION);
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicDraftServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicDraftServiceImpl.java
@ -752,6 +752,7 @@ public class TopicDraftServiceImpl extends BaseServiceImpl<TopicDraftDao, TopicD
            List<ResiTopicAttachmentEntity> topicAttachments = ConvertUtils.sourceToTarget(attachmentList, ResiTopicAttachmentEntity.class);
            topicAttachments.forEach(item -> {
                item.setId(null);
+                item.setCustomerId(tokenDto.getCustomerId());
                item.setTopicId(resiTopic.getId());
                item.setCreatedBy(draft.getCreatedBy());
                item.setUpdatedBy(draft.getCreatedBy());
--- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicAttachmentDao.xml
+++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicAttachmentDao.xml
@ -82,6 +82,7 @@
        insert into resi_topic_attachment
        (
        id,
+        customer_id,
        topic_id,
        attachment_name,
        attachment_format,
@ -99,6 +100,7 @@
        <foreach collection="list" item="item" index="index" separator=",">
            (
            (SELECT REPLACE(UUID(), '-', '') AS id),
+            #{item.customerId},
            #{item.topicId},
            #{item.attachmentName},
            #{item.attachmentFormat},
--- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicOperationDao.xml
+++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicOperationDao.xml
@ -78,6 +78,9 @@
            <if test='null != operationReason'>
                operation_reason,
            </if>
+            <if test='null != customerId and "" != customerId'>
+                customer_id,
+            </if>
            <if test ='null != createdBy'>
                created_by,
            </if>
@ -104,6 +107,9 @@
            <if test='null != operationReason'>
                #{operationReason},
            </if>
+            <if test='null != customerId and "" != customerId'>
+                #{customerId},
+            </if>
            <if test ='null != createdBy'>
                #{createdBy},
            </if>