From c40cf5dde3e41339ef5300192e0310070886e5af Mon Sep 17 00:00:00 2001 From: kongdeqiang <123456> Date: 星期三, 26 三月 2025 17:22:19 +0800 Subject: [PATCH] fix: 新增设备时自动添加编号 --- platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/ContractController.java | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/ContractController.java b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/ContractController.java index b75ded5..1d8bf4e 100644 --- a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/ContractController.java +++ b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/ContractController.java @@ -1,8 +1,11 @@ package com.by4cloud.platformx.device.controller; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.by4cloud.platformx.common.core.util.R; @@ -48,6 +51,9 @@ @PreAuthorize("@pms.hasPermission('platformx_contract_view')" ) public R getContractPage(@ParameterObject Page page, @ParameterObject Contract contract) { LambdaQueryWrapper<Contract> wrapper = Wrappers.lambdaQuery(); + wrapper.eq(contract.getType()!=null,Contract::getType,contract.getType()); + wrapper.like(StringUtils.isNotEmpty(contract.getName()),Contract::getName,contract.getName()); + wrapper.like(StringUtils.isNotEmpty(contract.getNumber()),Contract::getNumber,contract.getNumber()); return R.ok(contractService.page(page, wrapper)); } -- Gitblit v1.9.1