2021与蓝度共同重构项目,服务端
fix
zhanzhiqin
2022-04-15 c9586d61be8ae3411c6428a2cc2588c11f97db2c
ximon-admin/src/main/java/com/sandu/ximon/admin/service/WaterQualityDataService.java
@@ -29,9 +29,13 @@
     * 模糊查询
     */
    public List<WaterQualityDataBo> listWaterQualityDataByKeyword(BaseConditionVO baseConditionVO, String keyword) {
        Long clientId = SecurityUtils.getClientId();
        PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
        List<Long> waterQualityDataId = waterQualityDataMapper.listWaterQualityDataId(keyword, clientId);
        List<Long> waterQualityDataId;
        if(SecurityUtils.getClientId() == null){
            waterQualityDataId = waterQualityDataMapper.listWaterQualityDataId(keyword, null);
        }else{
            waterQualityDataId = waterQualityDataMapper.listWaterQualityDataId(keyword, SecurityUtils.getUserId());
        }
        if (CollUtil.isEmpty(waterQualityDataId)) {
            return CollUtil.newArrayList();
        }