Merge branch 'dev' into dev_dz

zhuo

2025-03-04 32ba5ac318edf01cccc7b4d8827c4c1dc9c90f30

 cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceMaintenanceImpl.java

@@ -12,6 +12,7 @@
import com.ruoyi.device.pojo.DeviceMaintenance;
import com.ruoyi.device.service.DeviceMaintenanceService;
import com.ruoyi.inspect.util.HackLoopTableRenderPolicy;
import org.apache.commons.lang3.ObjectUtils;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
@@ -27,7 +28,11 @@

    @Override
    public IPage<DeviceMaintenance> getDeviceMaintenancePage(Page page, Integer deviceId, String deviceNumber) {
        if (ObjectUtils.isEmpty(deviceNumber)){
        return baseMapper.selectPage(page, Wrappers.<DeviceMaintenance>lambdaQuery()
                    .eq(DeviceMaintenance::getDeviceId, deviceId));
        }
       else return baseMapper.selectPage(page, Wrappers.<DeviceMaintenance>lambdaQuery()
                .eq(DeviceMaintenance::getDeviceId, deviceId)
                .like(DeviceMaintenance::getDeviceNumber, deviceNumber));
    }