fix

zhanzhiqin

2022-01-06 e525cffa5ae93048d0ac1208d100e08bc69a4a3a

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

@@ -56,21 +56,15 @@
    public List<MonitorBo> listMonitorByKeyword(BaseConditionVO baseConditionVO, MonitorParam monitorParam) {
        Long clientId = SecurityUtils.getClientId();
        PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
        List<Long> listAirEquipmentId;

        List<MonitorBo> monitorList;
        //绑定状态：已绑定/未绑定/全部
        if (monitorParam.getBindingState() == null || 2 == monitorParam.getBindingState()) {
            //全部
            int bindingState = 2;
            listAirEquipmentId = monitorMapper.listMonitorId(monitorParam.getKeyword(), clientId, bindingState);
            monitorList = monitorMapper.listMonitorByIds(monitorParam.getKeyword(), clientId, bindingState);
        } else {
            listAirEquipmentId = monitorMapper.listMonitorId(monitorParam.getKeyword(), clientId, monitorParam.getBindingState());
            monitorList = monitorMapper.listMonitorByIds(monitorParam.getKeyword(), clientId, monitorParam.getBindingState());
        }
        if (CollUtil.isEmpty(listAirEquipmentId)) {
            return CollUtil.newArrayList();
        }

        List<MonitorBo> monitorList = monitorMapper.listMonitorByIds(listAirEquipmentId);
        return monitorList;
    }