fix

zhanzhiqin

2022-05-27 79a8cabb198848de013978d999d337f6ce386d4d

 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/GetListOnBindingController.java

@@ -1,13 +1,11 @@
package com.sandu.ximon.admin.controller;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.pagehelper.util.StringUtil;
import com.sandu.common.domain.ResponseVO;
import com.sandu.common.util.ResponseUtil;
import com.sandu.common.util.SpringContextHolder;
import com.sandu.ximon.admin.param.BroadcastTerminalV2Param;
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.admin.service.*;
import com.sandu.ximon.dao.bo.BroadcastTerminalV2EntityBo;
@@ -50,8 +48,8 @@
            wrapper.eq(Client::getSuperiorId, SecurityUtils.getUserId());
        }
        if (!StringUtil.isEmpty(keyword)) {
            wrapper.eq(Client::getId, keyword).or(w -> {
                w.eq(Client::getClientName, keyword);
            wrapper.like(Client::getId, keyword).or(w -> {
                w.like(Client::getClientName, keyword);
            });
        }
        List<Client> list = SpringContextHolder.getBean(ClientService.class).list(wrapper);
@@ -145,7 +143,13 @@
     */
    @GetMapping("/getLedFilesList")
    public ResponseVO<Object> getLedFilesList() {
        List<LedSFile> list = SpringContextHolder.getBean(LedSFileService.class).list();
        LambdaQueryWrapper<LedSFile> wrapper = Wrappers.lambdaQuery(LedSFile.class);
        if (SecurityUtils.getClientId() != null) {
            wrapper.eq(LedSFile::getCilentId, SecurityUtils.getUserId()).or(w -> {
                w.eq(LedSFile::getUserId, SecurityUtils.getUserId());
            });
        }
        List<LedSFile> list = SpringContextHolder.getBean(LedSFileService.class).list(wrapper);

        List<Map> mapList = new ArrayList<>();
        Map map;
@@ -245,10 +249,6 @@

    @GetMapping("/getIpVolumeList")
    public ResponseVO<Object> getIpVolumeList(@RequestParam(required = false, value = "keyword") String keyword) {
        BroadcastTerminalV2Param param = new BroadcastTerminalV2Param();
        param.setBindingState(2);
        param.setKeyword(null);
        param.setWorkState(2);
        List<BroadcastTerminalV2EntityBo> broadcastTerminalList = ipVolumeService.newIpTerminalList(keyword);
        List<Map> mapList = new ArrayList<>();
        Map map;