changes

liuhaonan

2022-10-12 6fe040e3e2805c28442090221e9a4597381830d9

 ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirEquipmentNongGengService.java

@@ -61,27 +61,35 @@
            PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
        }
        List<AirEquipmentNongGengBo> airEquipmentBos;
//        if (SecurityUtils.getClientId() == null) {
//            airEquipmentBos = airEquipmentNongGengMapper.listAirEquipmentByIds(keyword, null);
//        } else {
//            airEquipmentBos = airEquipmentNongGengMapper.listAirEquipmentByIds(keyword, SecurityUtils.getUserId());
//        }

        if (SecurityUtils.getClientId() == null) {
            airEquipmentBos = airEquipmentNongGengMapper.listAirEquipmentByIds(keyword, null);
        } else {
            airEquipmentBos = airEquipmentNongGengMapper.listAirEquipmentByIds(keyword, SecurityUtils.getUserId());
        }

        return airEquipmentBos;
        return null;
//        return airEquipmentBos;
    }

    /**
     * 大气设备列表（农耕，用于首页数据统计）
     */
    public List<AirEquipmentNongGengBo> listAirEquipmentOnHome() {
        List<AirEquipmentNongGengBo> airEquipmentBos;
        if (SecurityUtils.getClientId() == null) {
            airEquipmentBos = airEquipmentNongGengMapper.listAirEquipmentByIds(null, null);
        } else {
            airEquipmentBos = airEquipmentNongGengMapper.listAirEquipmentByIds(null, SecurityUtils.getUserId());
        }
//        List<AirEquipmentNongGengBo> airEquipmentBos;
//        if (SecurityUtils.getClientId() == null) {
//            airEquipmentBos = airEquipmentNongGengMapper.listAirEquipmentByIds(null, null);
//        } else {
//            airEquipmentBos = airEquipmentNongGengMapper.listAirEquipmentByIds(null, SecurityUtils.getUserId());
//        }

        return airEquipmentBos;
//        return airEquipmentBos;
        return null;
    }

    /**