fix

zhanzhiqin

2022-04-13 aee78de39e2d957a0c4a91f75ab9f77b03e46af3

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

@@ -5,6 +5,7 @@
import cn.hutool.http.HttpUtil;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.SerializationUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.pagehelper.PageHelper;
import com.sandu.common.execption.BusinessException;
@@ -67,7 +68,15 @@
            monitorParam.setEquipmentState(2);
        }

        monitorList = monitorMapper.listMonitorByIds(monitorParam.getKeyword(), clientId, monitorParam.getBindingState(), monitorParam.getEquipmentState());

        //为空是超管
        if (SecurityUtils.getClientId() == null) {
            monitorList = monitorMapper.listMonitorByIds(monitorParam.getKeyword(), clientId
                    , monitorParam.getBindingState(), monitorParam.getEquipmentState(), null);
        } else {
            monitorList = monitorMapper.listMonitorByIds(monitorParam.getKeyword(), clientId
                    , monitorParam.getBindingState(), monitorParam.getEquipmentState(), SecurityUtils.getUserId());
        }

        return monitorList;
    }
@@ -115,7 +124,7 @@
        Map<String, Object> paramMap = new HashMap<>();
        paramMap.put("accessToken", accessToken);
        paramMap.put("deviceSerial", deviceSerial);
        if(validateCode != null ){
        if (validateCode != null) {
            paramMap.put("validateCode", validateCode);
        }
        String s = HttpUtil.post(YSY_URL + ADD_DEVICE_URL, paramMap);