From 1a0d36e49151b23bb83f5f71134da81eb2066c41 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期二, 11 十月 2022 09:57:49 +0800
Subject: [PATCH] update

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComEventServiceImpl.java |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComEventServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComEventServiceImpl.java
index 60d1350..b06df48 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComEventServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComEventServiceImpl.java
@@ -3,6 +3,7 @@
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.NumberUtil;
+import cn.hutool.core.util.RandomUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -199,7 +200,6 @@
     @Override
     @Transactional(rollbackFor = Exception.class)
     public R conciliationEvent(ComEventConciliationVO comEventConciliationVO, LoginUserInfoVO loginUserInfo) {
-        saveEventImageList(comEventConciliationVO.getImages(), comEventConciliationVO.getId(),null,4);
         ComEvent comEvent = baseMapper.selectById(comEventConciliationVO.getId());
         comEvent.setEventSucceed(comEventConciliationVO.getEventSucceed());
         comEvent.setEventResult(comEventConciliationVO.getEventResult());
@@ -243,8 +243,10 @@
         comEventTransferRecord.setSpecialistName(comEvent.getSpecialistName());
         comEventTransferRecord.setEventResult(comEvent.getEventSucceed());
         comEventTransferRecord.setEventStatus(comEvent.getEventProcessStatus());
+        //雪花id失效,使用eventId随机生成
         comEventTransferRecord.setId(Snowflake.getId());
-        saveEventImageList(comEvent.getImages(),comEvent.getId(),comEventTransferRecord.getId(),4);
+        //saveEventImageList(comEvent.getImages(),comEvent.getId(),comEventTransferRecord.getId(),4);
+        saveEventImageList(comEventConciliationVO.getImages(), comEventConciliationVO.getId(),comEventTransferRecord.getId(),4);
         comEventTransferRecordService.insertComEventTransferRecord(comEventTransferRecord);
         return flag > 0 ? R.ok() : R.fail(ReturnMsgConstants.UPDATE_FALSE);
     }

--
Gitblit v1.7.1