修正删除

schoolNewsServ/api/api-news/src/main/java/org/xyzh/api/news/recommend/ResourceRecommendService.java

@@ -43,21 +43,13 @@ public interface ResourceRecommendService {
     ResultDomain<TbResourceRecommend> updateRecommend(TbResourceRecommend recommend);
 
     /**
-     * @description 删除推荐资源
-     * @param resourceID 资源ID
+     * @description 删除推荐记录
+     * @param recommendID 推荐记录ID
      * @return ResultDomain<Boolean> 删除结果
      * @author yslg
      * @since 2025-10-15
      */
-    ResultDomain<Boolean> deleteRecommend(String resourceID);
-    /**
-     * @description 移除推荐资源
-     * @param resourceID 资源ID
-     * @return ResultDomain<Boolean> 移除结果
-     * @author yslg
-     * @since 2025-10-15
-     */
-    ResultDomain<Boolean> removeRecommend(String resourceID);
+    ResultDomain<Boolean> deleteRecommend(String recommendID);
 
     /**
      * @description 更新推荐排序

schoolNewsServ/news/src/main/java/org/xyzh/news/service/impl/NCResourceRecommendServiceImpl.java

@@ -162,31 +162,34 @@ public class NCResourceRecommendServiceImpl implements ResourceRecommendService
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public ResultDomain<Boolean> deleteRecommend(String resourceID) {
+    public ResultDomain<Boolean> deleteRecommend(String recommendID) {
         ResultDomain<Boolean> resultDomain = new ResultDomain<>();
         try {
-            // 参数验证
-            if (!StringUtils.hasText(resourceID)) {
-                resultDomain.fail("资源ID不能为空");
+            if (!StringUtils.hasText(recommendID)) {
+                resultDomain.fail("推荐ID不能为空");
                 return resultDomain;
             }
 
-            // 查询推荐
-            List<TbResourceRecommend> recommendList = resourceRecommendMapper.selectByResourceId(resourceID);
-            if (recommendList == null || recommendList.isEmpty()) {
+            TbResourceRecommend recommend = resourceRecommendMapper.selectByRecommendId(recommendID);
+            if (recommend == null) {
                 resultDomain.fail("推荐不存在");
                 return resultDomain;
             }
 
-            // 物理删除
-            TbResourceRecommend recommend = recommendList.get(0);
+            String resourceID = recommend.getResourceID();
             int result = resourceRecommendMapper.deleteResourceRecommend(recommend);
             if (result > 0) {
-                logger.info("删除推荐成功: {}", resourceID);
-                TbResource resource = new TbResource();
-                resource.setResourceID(recommend.getResourceID());
-                resource.setIsRecommend(false);
-                resourceMapper.updateResource(resource);
+                logger.info("删除推荐成功，推荐ID: {}, 资源ID: {}", recommendID, resourceID);
+                
+                List<TbResourceRecommend> remainingRecommends = resourceRecommendMapper.selectByResourceId(resourceID);
+                if (remainingRecommends == null || remainingRecommends.isEmpty()) {
+                    TbResource resource = new TbResource();
+                    resource.setResourceID(resourceID);
+                    resource.setIsRecommend(false);
+                    resourceMapper.updateResource(resource);
+                    logger.info("资源无其他推荐，更新isRecommend为false: {}", resourceID);
+                }
+                
                 resultDomain.success("删除推荐成功", true);
                 return resultDomain;
             } else {
@@ -200,12 +203,6 @@ public class NCResourceRecommendServiceImpl implements ResourceRecommendService
         }
     }
 
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public ResultDomain<Boolean> removeRecommend(String resourceID) {
-        return deleteRecommend(resourceID);
-    }
-
     @Override
     @Transactional(rollbackFor = Exception.class)
     public ResultDomain<TbResourceRecommend> batchAddRecommends(List<String> resourceIDs, Integer recommendType, String reason) {

schoolNewsWeb/src/apis/resource/banner.ts

@@ -63,9 +63,7 @@ export const bannerApi = {
    * @returns Promise<ResultDomain<boolean>>
    */
   async deleteBanner(banner: Banner): Promise<ResultDomain<boolean>> {
-    const response = await api.delete<boolean>('/news/banners/banner', {
-      data: banner
-    });
+    const response = await api.delete<boolean>('/news/banners/banner', banner);
     return response.data;
   },
 
@@ -75,7 +73,7 @@ export const bannerApi = {
    * @returns Promise<ResultDomain<boolean>>
    */
   async deleteBannerById(bannerID: string): Promise<ResultDomain<boolean>> {
-    return this.deleteBanner({ id: bannerID });
+    return this.deleteBanner({ bannerID: bannerID });
   },
 
   /**

schoolNewsWeb/src/views/admin/manage/content/BannerManagementView.vue

@@ -449,7 +449,7 @@ async function handleDelete(banner: Banner) {
       }
     );
 
-    await bannerApi.deleteBannerById(banner.id!);
+    await bannerApi.deleteBannerById(banner.bannerID!);
     ElMessage.success('删除成功');
     await loadBanners();
   } catch (error) {

schoolNewsWeb/src/views/admin/manage/content/ColumnManagementView.vue

@@ -690,7 +690,7 @@ async function deleteRecommend(item: ResourceRecommendVO) {
       }
     );
     
-    await resourceRecommendApi.deleteRecommend(item.resourceID!);
+    await resourceRecommendApi.deleteRecommend(item.id!);
   ElMessage.success('删除成功');
     await refreshCurrentTab();
   } catch (error: any) {