lyq 4 mesi fa
parent
commit
a7d579432c

+ 2 - 1
src/main/java/com/sooka/sponest/event/centereventteventcatalogue/service/impl/CentereventTEventcatalogueServiceImpl.java

@@ -168,7 +168,7 @@ public class CentereventTEventcatalogueServiceImpl extends BaseService implement
     public int addCentereventTEventcatalogue(CentereventTEventcatalogue centereventTEventcatalogue) {
         String eventCode = IdUtils.fastSimpleUUID();
         CentereventTFireLog centereventTFireLog = new CentereventTFireLog();
-        centereventTEventcatalogue.setId(IdUtils.fastSimpleUUID());
+        centereventTEventcatalogue.setId(eventCode);
         centereventTEventcatalogue.setEventCode(eventCode);
         if (StringUtils.isEmpty(centereventTEventcatalogue.getReportSource())) {
             centereventTEventcatalogue.setReportSource("reporting_source_2");
@@ -232,6 +232,7 @@ public class CentereventTEventcatalogueServiceImpl extends BaseService implement
         centereventDeptEvent.setDeptHandleType("dept_handleType_2");
         centereventDeptEvent.setCreateBy(SecurityUtils.getUserId().toString());
         centereventDeptEvent.setCreateName(SecurityUtils.getLoginUser().getSysUser().getNickName());
+        centereventDeptEvent.setCreateTime(centereventTEventcatalogue.getCreateTime());
         centereventDeptEventService.insertCentereventTDeptEvent(centereventDeptEvent);
 //        if (StringUtils.isNotEmpty(centereventTEventcatalogue.getHgjDeptId())) {
 //            centereventDeptEvent.setId(IdUtils.fastSimpleUUID());

+ 1 - 1
src/main/resources/mapper/centereventteventcatalogue/CenterEventViewMapper.xml

@@ -172,7 +172,7 @@
             </if>
         </where>
         group by event_code) l
-        left join ${database_data}.centerdata_t_attach f on f.bus_id = l.id
+        inner join ${database_data}.centerdata_t_attach f on f.bus_id = l.id
         <if test="templateType != 'true'">
             group by bus_id
         </if>