Merge branch 'master' into docker_package

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

@@ -2385,7 +2385,6 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
             List<Map<String, Object>> lcDept = sysDeptDao.selectLCDeptByUcsDeptName(params.get("deptId").toString());
             if (lcDept.isEmpty()) {
                 logger.error("未查询到{}对应的浪潮系统部门", params.get("deptId").toString());
-//                return new ArrayList<>();
             } else {
                 StringBuilder sb = new StringBuilder("SELECT  " +
                         "  COUNT( BSNUM ) AS \"count\",  " +
@@ -2447,6 +2446,10 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
                         countMap.put(item.get("type").toString(), Integer.parseInt(item.get("count").toString()));
                     }
                 });
+                if (!cloud) {
+                    map.put("yzy", "0");
+                    map.put("ysp", "0");
+                }
                 resultList.add(map);
             });
             Integer total = 0;