Merge remote-tracking branch 'origin/master'

liuhaonan

2022-04-19 9330e9b0e4e70151d36084ecb5695b818cfda2db

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

@@ -39,7 +39,9 @@
     */
    public List<WaterQualityEquipmentBo> listWaterQualityEquipmentByKeyword(BaseConditionVO baseConditionVO, String keyword) {
        Long userId = SecurityUtils.getUserId();
        PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
        if (baseConditionVO != null) {
            PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
        }
        List<WaterQualityEquipmentBo> waterQualityEquipmentBoList;
        //为空是超管
        if (SecurityUtils.getClientId() == null) {