diff --git a/renren-admin/src/main/java/io/renren/modules/activiti/controller/ActTaskController.java b/renren-admin/src/main/java/io/renren/modules/activiti/controller/ActTaskController.java index e18b7c7e..43d32427 100644 --- a/renren-admin/src/main/java/io/renren/modules/activiti/controller/ActTaskController.java +++ b/renren-admin/src/main/java/io/renren/modules/activiti/controller/ActTaskController.java @@ -201,7 +201,7 @@ public class ActTaskController { .map(index_ -> index_.getMember()) .filter(Objects::nonNull) .flatMap(index_ -> index_.stream()) - .map(index_ -> (String) index_.get("id")) + .map(index_ -> index_.get("id").toString()) .filter(index_ -> !userId.equals(index_)) // 过滤非本人 .distinct() .collect(Collectors.toList()); diff --git a/renren-admin/src/main/java/io/renren/modules/activiti/service/ActTaskService.java b/renren-admin/src/main/java/io/renren/modules/activiti/service/ActTaskService.java index 1a2cf430..e8d9717c 100644 --- a/renren-admin/src/main/java/io/renren/modules/activiti/service/ActTaskService.java +++ b/renren-admin/src/main/java/io/renren/modules/activiti/service/ActTaskService.java @@ -153,7 +153,7 @@ public class ActTaskService extends BaseServiceImpl { .filter(Objects::nonNull) .filter(index -> !index.isEmpty()) .flatMap(index -> index.stream()) - .map(index -> (String) index.get("id")) + .map(index -> index.get("id").toString()) .filter(index -> !userId.equals(index)) // 过滤非本人 .distinct() .collect(Collectors.toList()); 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 4a0f0217..58b49478 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 @@ -129,6 +129,8 @@ public class ResourceServiceImpl extends CrudServiceImpl resultMap = new HashMap<>(); List re = resourceDao.selectTypeCount(null); @@ -2235,14 +2238,14 @@ public class ResourceServiceImpl extends CrudServiceImpl sb.append("'").append(x.get("lc_name").toString()).append("', ")); sb.deleteCharAt(sb.length() - 2); sb.append(") UNION ALL " + - "SELECT " + - " COUNT( BSNUM ) AS \"count\", " + - " 'ysp' AS \"type\" " + - "FROM " + - " VIEW_VIDEO_BUSINESS_INDEX " + - "WHERE " + - " 1 = 1 " + - " AND ORG_NAME IN ("); + "SELECT " + + " COUNT( BSNUM ) AS \"count\", " + + " 'ysp' AS \"type\" " + + "FROM " + + " VIEW_VIDEO_BUSINESS_INDEX " + + "WHERE " + + " 1 = 1 " + + " AND ORG_NAME IN ("); lcDept.forEach(x -> sb.append("'").append(x.get("lc_name").toString()).append("', ")); sb.deleteCharAt(sb.length() - 2); sb.append(")"); @@ -2257,14 +2260,14 @@ public class ResourceServiceImpl extends CrudServiceImpl> typeCountListByApplyDept = resourceDao.selectApplyDeptDetailTypeCountList(params); zwyCountListMap.forEach((k, v) -> { - Map zwyCountMap = new HashMap<>(); - zwyCountMap.put("count", v.stream().mapToInt(it -> Integer.parseInt(it.get("count").toString())).sum()); - zwyCountMap.put("type", k); - zwyCountMap.put("deptName", params.get("deptId").toString()); - zwyCountMap.put("district", 250000); - zwyCountMap.put("deptType", 2); - typeCountListByApplyDept.add(zwyCountMap); - } + Map zwyCountMap = new HashMap<>(); + zwyCountMap.put("count", v.stream().mapToInt(it -> Integer.parseInt(it.get("count").toString())).sum()); + zwyCountMap.put("type", k); + zwyCountMap.put("deptName", params.get("deptId").toString()); + zwyCountMap.put("district", 250000); + zwyCountMap.put("deptType", 2); + typeCountListByApplyDept.add(zwyCountMap); + } ); Map>> typeCountListMap = typeCountListByApplyDept.stream().collect(Collectors.groupingBy(m -> m.get("deptName").toString())); @@ -2313,8 +2316,9 @@ public class ResourceServiceImpl extends CrudServiceImpl> typeCountListByDept = resourceDao.selectDeptDetailTypeCountList(params); Map>> typeCountListMap = typeCountListByDept.stream().collect(Collectors.groupingBy(m -> m.get("deptName").toString())); diff --git a/renren-admin/src/main/resources/ehcache.xml b/renren-admin/src/main/resources/ehcache.xml index ea90c19b..c3edf26f 100644 --- a/renren-admin/src/main/resources/ehcache.xml +++ b/renren-admin/src/main/resources/ehcache.xml @@ -110,4 +110,13 @@ diskPersistent="true" memoryStoreEvictionPolicy="LRU"/> + + \ No newline at end of file