|
@ -1,5 +1,6 @@ |
|
|
package org.dromara.sample.wayline.service.impl; |
|
|
package org.dromara.sample.wayline.service.impl; |
|
|
|
|
|
|
|
|
|
|
|
import cn.hutool.core.util.ObjectUtil; |
|
|
import cn.hutool.crypto.digest.MD5; |
|
|
import cn.hutool.crypto.digest.MD5; |
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; |
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; |
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
|
@ -99,7 +100,7 @@ public class WaylineFileServiceImpl implements IWaylineFileService { |
|
|
wrapper.eq(WaylineFileEntity::getDroneModelKey, type.getType()).or(); |
|
|
wrapper.eq(WaylineFileEntity::getDroneModelKey, type.getType()).or(); |
|
|
} |
|
|
} |
|
|
}) |
|
|
}) |
|
|
.and(param.getDeviceSn() != null, wrapper -> { |
|
|
.and(ObjectUtil.isNotEmpty(param.getDeviceSn()), wrapper -> { |
|
|
wrapper.eq(WaylineFileEntity::getDeviceSn, param.getDeviceSn()).or(); |
|
|
wrapper.eq(WaylineFileEntity::getDeviceSn, param.getDeviceSn()).or(); |
|
|
}) |
|
|
}) |
|
|
.like(Objects.nonNull(param.getKey()), WaylineFileEntity::getName, param.getKey()) |
|
|
.like(Objects.nonNull(param.getKey()), WaylineFileEntity::getName, param.getKey()) |
|
|