Commit 9f287824 by 丁伟峰

Merge branch 'feat-dingwf-mvp616' into develop

2 parents 5256762b 09dbc25a
......@@ -101,11 +101,11 @@ public class CapacityQueryServiceImpl implements CapacityQueryService {
if (item instanceof CapacityOrgStatEntity) {
// cluster/branch查询,都是capacity_org_stat
CapacityOrgStatEntity e = (CapacityOrgStatEntity) item;
OrgGroupEntity g = orgGroupDao.getByGroupId(e.getOrgId());
if (g == null) {
log.warn("orgId: {} ===> null", e.getOrgId());
if ("group".equals(e.getType())) {
OrgGroupEntity g = orgGroupDao.getByGroupId(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 {
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!