diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/SarFileSplitMenuEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/SarFileSplitMenuEOMapper.java index 4bbb0e050..29a22c4c4 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/SarFileSplitMenuEOMapper.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/SarFileSplitMenuEOMapper.java @@ -48,7 +48,7 @@ public interface SarFileSplitMenuEOMapper extends BaseMapper int deleteByIdList(@Param("idList") List idList); - + SarFileSplitMenuEO selectGeneral(@Param("infoId") String infoId); int insert(SarFileSplitMenuEO sarFileSplitMenuEO); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/xml/SarFileSplitMenuEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/xml/SarFileSplitMenuEOMapper.xml index ba1e9b4eb..ba957e123 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/xml/SarFileSplitMenuEOMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/xml/SarFileSplitMenuEOMapper.xml @@ -350,5 +350,9 @@ + diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java index 945986e47..7c0ca1533 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java @@ -1459,6 +1459,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl result = importSplitItems(mFile, cut, menuId, infoId); - if(result.isSuccess()){ - sarFileSplitInfoService.save(sarFileSplitInfoEO); - sarFileSplitMenuEOMapper.insertSelective(sarFileSplitMenuEO); + if(!result.isSuccess()){ + sarFileSplitInfoService.deleteById(infoId); } return result; } @@ -2036,7 +2037,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl"; } map.put("message", html); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitInfoServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitInfoServiceImpl.java index 24bc0dc28..3ab2cadca 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitInfoServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitInfoServiceImpl.java @@ -1,6 +1,7 @@ package com.jero.modules.split.service.impl; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.constant.enums.CutEnum; @@ -11,10 +12,12 @@ import com.jero.generater.modules.online.cgform.service.impl.OnlCgformFieldServi import com.jero.modules.oss.entity.OSSFile; import com.jero.modules.oss.service.IOSSFileService; import com.jero.modules.split.entity.SarFileSplitInfoEO; +import com.jero.modules.split.entity.SarFileSplitMenuEO; import com.jero.modules.split.enums.SplitFileTypeTypeEnum; import com.jero.modules.split.mapper.SarFileSplitInfoMapper; import com.jero.modules.split.mapper.SarFileSplitMenuEOMapper; import com.jero.modules.split.service.ISarFileSplitInfoService; +import com.jero.modules.split.service.ISarFileSplitMenuEOService; import com.jero.modules.system.entity.SysDictItem; import com.jero.modules.system.service.ISysDictItemService; import org.apache.commons.lang.StringUtils; @@ -49,6 +52,8 @@ public class SarFileSplitInfoServiceImpl extends ServiceImpl ids) { removeByIds(ids); + for(String id : ids){ + // 删除条款和目录 + SarFileSplitMenuEO menu = sarFileSplitMenuEOMapper.selectGeneral(id); + if(ObjectUtil.isNotEmpty(menu)) { + sarFileSplitMenuEOService.deleteMenu(menu.getId()); + } + } } /**