目录下有已上传图片不能删除

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<DaPicturesRecard> daPicturesRecards = daPicturesRecardService.selectDaPicturesRecardList(picturesRecard);
+        if(daPicturesRecards!=null&&daPicturesRecards.size()>0){
+            return AjaxResult.error("目录下有已上传的图片，不能删除");
+        }
         int i= daCatalogMapper.deleteDaCatalogById(id);
         if(i>0){
             return AjaxResult.success();