diff --git a/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java b/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java index 527bdd45..40ad4a9e 100644 --- a/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java +++ b/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java @@ -394,7 +394,6 @@ public class ResourceServiceImpl extends CrudServiceImpl resourceDTOS; if (orderField.equals("total")) { // 对总体评价特殊处理 - List ids = new ArrayList<>(); + List ids = new CopyOnWriteArrayList<>(); switch (orderType.toUpperCase()) { case "DESC": // total 倒序 ids = selectDTOPageSpecilTotal.parallelStream().map(Map.class::cast).sorted(Comparator.comparing(x -> { diff --git a/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml b/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml index e23b779b..8d6a6232 100644 --- a/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml +++ b/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml @@ -133,7 +133,7 @@ LEFT JOIN sys_dept sd ON tdr.dept_id = sd.id WHERE 1 = 1 AND tdr.del_flag = 0 - + AND tdr.type != '赋能案例'