Merge remote-tracking branch 'origin/master'

liuhaonan

2022-04-19 9330e9b0e4e70151d36084ecb5695b818cfda2db

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

@@ -31,9 +31,9 @@
    public List<WaterQualityDataBo> listWaterQualityDataByKeyword(BaseConditionVO baseConditionVO, String keyword) {
        PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
        List<Long> waterQualityDataId;
        if(SecurityUtils.getClientId() == null){
        if (SecurityUtils.getClientId() == null) {
            waterQualityDataId = waterQualityDataMapper.listWaterQualityDataId(keyword, null);
        }else{
        } else {
            waterQualityDataId = waterQualityDataMapper.listWaterQualityDataId(keyword, SecurityUtils.getUserId());
        }
        if (CollUtil.isEmpty(waterQualityDataId)) {
@@ -83,7 +83,8 @@
            save(waterQualityData);
        } catch (Exception e) {
            e.printStackTrace();
            throw new BusinessException("水质设备号不正确");
            log.error("水质设备号不正确");
//            throw new BusinessException("水质设备号不正确");
        }

        return waterQualityDataDto;