修改Organization_Layout查询接口返回数据

lizijie

2022-03-08 70f550bb3414caef9a02f34a053ad9a69d9c663d

修改Organization_Layout查询接口返回数据

 screen-api/src/main/java/com/moral/api/controller/OrganizationLayoutController.java

@@ -33,7 +33,7 @@
        }
        Map<String,Object> resultMap = organizationLayoutService.getLayoutByMac(parameters.get("mac").toString());
        if (ObjectUtils.isEmpty(resultMap)){
            return null;
            return ResultMessage.ok();
        }
        return ResultMessage.ok(resultMap);
    }

 screen-api/src/main/java/com/moral/api/service/impl/OrganizationLayoutServiceImpl.java

@@ -52,9 +52,6 @@
        wrapper_organizationLayout.eq("version_id",versionId);
        wrapper_organizationLayout.eq("is_delete",Constants.NOT_DELETE);
        List<OrganizationLayout> organizationLayouts = organizationLayoutMapper.selectList(wrapper_organizationLayout);
        if (ObjectUtils.isEmpty(organizationLayouts) || organizationLayouts.size()==0){
            return null;
        }
        Map<String, Object> resultMap = new HashMap<>();
        List<OrganizationLayout> chartSensorKeyList = new ArrayList<>();
        List<OrganizationLayout> coreMonitorItemsList = new ArrayList<>();