Merge remote-tracking branch 'origin/master'

xiangpei

2024-03-13 10df3eebf12aa53fe2f66af2dc75fcd0ef12251c

 ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java

@@ -1,7 +1,9 @@
package com.ycl.platform.service.impl;

import com.ycl.platform.domain.entity.YwPoint;
import com.ycl.platform.domain.entity.YwUnit;
import com.ycl.platform.mapper.YwPointMapper;
import com.ycl.platform.mapper.YwUnitMapper;
import com.ycl.platform.service.YwPointService;
import com.ycl.platform.service.YwUnitService;
import com.ycl.system.Result;
@@ -14,6 +16,7 @@
import com.ycl.system.entity.SysDept;
import com.ycl.system.service.ISysDeptService;
import org.apache.commons.lang3.StringUtils;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.ycl.system.page.PageUtil;
import org.springframework.beans.factory.annotation.Autowired;
@@ -27,6 +30,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import lombok.RequiredArgsConstructor;
import org.springframework.util.StringUtils;

/**
 * 运维点位 服务实现类
@@ -43,6 +47,7 @@
    private ISysDeptService deptService;
    @Autowired
    private YwUnitService unitService;
    private final YwUnitMapper ywUnitMapper;

    /**
     * 添加
@@ -124,6 +129,7 @@
    public Result page(YwPointQuery query) {

        IPage<YwPoint> page = new LambdaQueryChainWrapper<>(baseMapper)
                .like(StringUtils.hasText(query.getPointName()), YwPoint::getPointName, query.getPointName())
                .orderByDesc(YwPoint::getCreateTime)
                .page(PageUtil.getPage(query, YwPoint.class));