1、修改 能力统计列表和详情-组件服务-应用领域分布情况的sql语句

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();

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 < ( LENGTH( tdav.attr_value ) - LENGTH( REPLACE ( tdav.attr_value,
         ';', '' ) ) + 1 )
         WHERE