2021与蓝度共同重构项目,服务端
fix
zhanzhiqin
2022-04-15 c9586d61be8ae3411c6428a2cc2588c11f97db2c
ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirDataService.java
@@ -48,11 +48,15 @@
     * 查询大气数据(模糊查询)
     */
    public List<AirDataBo> listAirDataByKeyword(BaseConditionVO baseConditionVO, String keyword) {
        Long clientId = SecurityUtils.getClientId();
        PageHelper.startPage(baseConditionVO.getPageNo(),baseConditionVO.getPageSize());
        List<Long> listAirId = baseMapper.listAirId(keyword,clientId);
        if(CollUtil.isEmpty(listAirId)){
            return null;
        PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
        List<Long> listAirId;
        if (SecurityUtils.getClientId() == null) {
            listAirId = baseMapper.listAirId(keyword, null);
        } else {
            listAirId = baseMapper.listAirId(keyword, SecurityUtils.getUserId());
        }
        if (CollUtil.isEmpty(listAirId)) {
            return CollUtil.newArrayList();
        }
        List<AirDataBo> airDataBos = baseMapper.listAirDataByIds(listAirId);
        return airDataBos;