From 3d49aae51d0b4057deb6d8ea269ebed233314a01 Mon Sep 17 00:00:00 2001
From: yitonglei <ytl653@163.com>
Date: Thu, 7 Jul 2022 14:23:10 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E6=94=B9=20=E8=83=BD?=
 =?UTF-8?q?=E5=8A=9B=E7=BB=9F=E8=AE=A1=E5=88=97=E8=A1=A8=E5=92=8C=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85-=E7=BB=84=E4=BB=B6=E6=9C=8D=E5=8A=A1-=E5=BA=94?=
 =?UTF-8?q?=E7=94=A8=E9=A2=86=E5=9F=9F=E5=88=86=E5=B8=83=E6=83=85=E5=86=B5?=
 =?UTF-8?q?=E7=9A=84sql=E8=AF=AD=E5=8F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/category/service/impl/CategoryServiceImpl.java   | 5 -----
 .../src/main/resources/mapper/resource/ResourceDao.xml       | 2 +-
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/renren-admin/src/main/java/io/renren/modules/category/service/impl/CategoryServiceImpl.java b/renren-admin/src/main/java/io/renren/modules/category/service/impl/CategoryServiceImpl.java
index e0e56bfa..6cdddc3a 100644
--- a/renren-admin/src/main/java/io/renren/modules/category/service/impl/CategoryServiceImpl.java
+++ b/renren-admin/src/main/java/io/renren/modules/category/service/impl/CategoryServiceImpl.java
@@ -11,8 +11,6 @@ import io.renren.modules.category.service.CategoryService;
 import io.renren.modules.resource.dao.AttrDao;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cache.annotation.CacheEvict;
-import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -43,7 +41,6 @@ public class CategoryServiceImpl extends CrudServiceImpl<CategoryDao, Category,
     }
 
     @Override
-    @Cacheable(value = getCategoryTreeKey, key = "'getCategoryTree'")
     public List<CategoryDTO> getCategoryTree() {
         List<Category> topCategory = categoryDao.selectByParentId(null);
         List<CategoryDTO> list = new CopyOnWriteArrayList<>();
@@ -87,7 +84,6 @@ public class CategoryServiceImpl extends CrudServiceImpl<CategoryDao, Category,
 
     @Override
     @Transactional
-    @CacheEvict(key = getCategoryTreeKey, allEntries = true)
     public void deleteByIds(JSONObject jsonObject) {
         JSONArray jsonArray = jsonObject.getJSONArray("ids");
         //TODO：删除为一级分类时，删除模板保存的文件夹？
@@ -131,7 +127,6 @@ public class CategoryServiceImpl extends CrudServiceImpl<CategoryDao, Category,
 
     @Override
     @Transactional
-    @CacheEvict(key = getCategoryTreeKey, allEntries = true)
     public void update(CategoryDTO categoryDTO) {
         super.update(categoryDTO);
         String oldName = categoryDao.selectById(categoryDTO.getId()).getName();
diff --git a/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml b/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml
index b1baed6b..0dd803d0 100644
--- a/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml
+++ b/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml
@@ -1047,7 +1047,7 @@
         FROM
         (SELECT a.* FROM tb_data_attr a INNER JOIN tb_data_resource c ON a.data_resource_id = c.id
         INNER JOIN sys_dept b ON c.dept_id = b.id WHERE c.type =
-        #{resourceType} AND (b.id = #{id} OR INSTR(b.pids,#{id})) ) tdav
+        #{resourceType} AND (b.id = #{id} OR INSTR(b.pids,#{id})) AND c.del_flag = 0) tdav
         JOIN mysql.help_topic b ON b.help_topic_id &lt; ( LENGTH( tdav.attr_value ) - LENGTH( REPLACE ( tdav.attr_value,
         ';', '' ) ) + 1 )
         WHERE