Merge branch 'master' into docker_package

renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java

@@ -2105,7 +2105,7 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
                             countMap.put(count.get("type").toString(), Integer.parseInt(count.get("count").toString()));
                         }
                     });
-                    typeCountListMap2.remove(typeCountListMap2.get(index.get("deptName").toString()));// 去除
+                    typeCountListMap2.remove(typeCountListMap2.get(index.get("name").toString()));// 去除
                 }
                 return index;
             }).collect(Collectors.toList());