From 890582457b9ed9114292d7cf41de30f24a4a3989 Mon Sep 17 00:00:00 2001 From: hansha Date: Fri, 28 Jun 2024 16:05:20 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=AE=E5=BD=95=E4=B8=8B=E6=9C=89=E5=B7=B2?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=9B=BE=E7=89=87=E4=B8=8D=E8=83=BD=E5=88=A0?= =?UTF-8?q?=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dangan/service/impl/DaCatalogServiceImpl.java | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaCatalogServiceImpl.java b/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaCatalogServiceImpl.java index b475c8d..70d7d32 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaCatalogServiceImpl.java +++ b/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaCatalogServiceImpl.java @@ -9,8 +9,11 @@ import com.da.common.core.domain.model.LoginUser; import com.da.common.exception.ServiceException; import com.da.common.utils.DateUtils; import com.da.common.utils.StringUtils; +import com.da.dangan.domain.DaPicturesRecard; import com.da.dangan.mapper.DaCatalogMapper; import com.da.dangan.service.IDaCatalogService; +import com.da.dangan.service.IDaPicturesRecardService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -30,7 +33,8 @@ public class DaCatalogServiceImpl implements IDaCatalogService { @Resource private DaCatalogMapper daCatalogMapper; - + @Autowired + private IDaPicturesRecardService daPicturesRecardService; /** * 查询档案目录 * @@ -170,6 +174,13 @@ public class DaCatalogServiceImpl implements IDaCatalogService if(daCatalogs!=null&&daCatalogs.size()>0){ return AjaxResult.error("有子级目录，不能删除"); } + //目录下已有上传图片的 不能删除 + DaPicturesRecard picturesRecard = new DaPicturesRecard(); + picturesRecard.setMuId(id); + List daPicturesRecards = daPicturesRecardService.selectDaPicturesRecardList(picturesRecard); + if(daPicturesRecards!=null&&daPicturesRecards.size()>0){ + return AjaxResult.error("目录下有已上传的图片，不能删除"); + } int i= daCatalogMapper.deleteDaCatalogById(id); if(i>0){ return AjaxResult.success();