Merge remote-tracking branch 'origin/master'

zhanzhiqin

2022-04-28 bfce748e37a753c729e15dd233600379f504d019

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

@@ -38,10 +38,17 @@
     * 模糊查询
     */
    public List<WaterQualityEquipmentBo> listWaterQualityEquipmentByKeyword(BaseConditionVO baseConditionVO, String keyword) {
        Long clientId = SecurityUtils.getClientId();
        PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());

        List<WaterQualityEquipmentBo> waterQualityEquipmentBoList = waterQualityEquipmentMapper.listWaterQualityEquipmentByIds(keyword, clientId);
        Long userId = SecurityUtils.getUserId();
        if (baseConditionVO != null) {
            PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
        }
        List<WaterQualityEquipmentBo> waterQualityEquipmentBoList;
        //为空是超管
        if (SecurityUtils.getClientId() == null) {
            waterQualityEquipmentBoList = waterQualityEquipmentMapper.listWaterQualityEquipmentByIds(keyword, null);
        } else {
            waterQualityEquipmentBoList = waterQualityEquipmentMapper.listWaterQualityEquipmentByIds(keyword, userId);
        }
        return waterQualityEquipmentBoList;
    }

@@ -76,10 +83,11 @@
        WaterQualityEquipment one = getOne(Wrappers.lambdaQuery(WaterQualityEquipment.class).eq(WaterQualityEquipment::getWaterQualityEquipmentCode,
                waterQualityEquipment.getWaterQualityEquipmentCode()));
        if (one == null) {
            return save(waterQualityEquipment);
            WaterQualityEquipment result = new WaterQualityEquipment();
            result.setWaterQualityEquipmentCode(waterQualityEquipment.getWaterQualityEquipmentCode());
            return save(result);
        } else {
            waterQualityEquipment.setId(one.getId());
            return updateById(waterQualityEquipment);
            throw  new BusinessException("该水质设备已存在！");
        }
    }
}