Merge branch 'feat-dingwf-mvp616' into develop

project-order/src/main/java/com/alibaba/cloud/integration/order/service/impl/CapacityQueryServiceImpl.java

@@ -101,11 +101,11 @@ public class CapacityQueryServiceImpl implements CapacityQueryService {
             if (item instanceof CapacityOrgStatEntity) {
                 // cluster/branch查询，都是capacity_org_stat
                 CapacityOrgStatEntity e = (CapacityOrgStatEntity) item;
+                if ("group".equals(e.getType())) {
                     OrgGroupEntity g = orgGroupDao.getByGroupId(e.getOrgId());
-                if (g == null) {
-                    log.warn("orgId: {} ===> null", e.getOrgId());
+                    content.setGroupName(g.getGroupName());
                 }
-                content.setDate(e.getWorkday()).setLayer(e.getLayer()).setGroupName(g.getGroupName())
+                content.setDate(e.getWorkday()).setLayer(e.getLayer())
                         .setCapTotal(e.getCapTotal()).setCapUsed(e.getCapUsedTotal())
                         .setEngineerNum(e.getEngineerCount()).setUpdateTime(e.getUpdateTime());
             } else {