From 87e07ac8b8f1868eb4302fac73dfc93c5417f977 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 30 七月 2024 11:06:14 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/ForestFirePrevention
---
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlEquipmentServiceImpl.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlEquipmentServiceImpl.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlEquipmentServiceImpl.java
index 2a04f95..636bd7e 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlEquipmentServiceImpl.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlEquipmentServiceImpl.java
@@ -39,7 +39,7 @@
Page<SlEquipment> page = new Page<>(slEquipmentQuery.getPageCurr(), slEquipmentQuery.getPageSize());
LambdaQueryWrapper< SlEquipment> wrapper= Wrappers.lambdaQuery();
if(slEquipmentQuery.getEquipmentName()!=null&&slEquipmentQuery.getEquipmentName()!=""){
- wrapper.eq(SlEquipment::getEquipmentName,slEquipmentQuery.getEquipmentName());
+ wrapper.like(SlEquipment::getEquipmentName,slEquipmentQuery.getEquipmentName());
}
if(slEquipmentQuery.getEquipmentName()!=null&&slEquipmentQuery.getType()!=0){
wrapper.eq(SlEquipment::getType,slEquipmentQuery.getType());
@@ -51,6 +51,7 @@
List<SlEquipmentVO> list = slEquipmentVOPageDTO.getList();
for (SlEquipmentVO sl:list){
SlStoreManagement slStoreManagement = slStoreManagementMapper.selectById(sl.getManagementId());
+ sl.setStoreManagementName(slStoreManagement.getStoreManagementName());
sl.setCountyCode(slStoreManagement.getCountyCode());
sl.setProvinceName(slStoreManagement.getProvinceName());
sl.setProvinceCode(slStoreManagement.getProvinceCode());
@@ -101,6 +102,7 @@
SlStoreManagement slStoreManagement = slStoreManagementMapper.selectById(byId.getManagementId());
slEquipmentVO.setCountyCode(slStoreManagement.getCountyCode());
+ slEquipmentVO.setStoreManagementName(slStoreManagement.getStoreManagementName());
slEquipmentVO.setProvinceName(slStoreManagement.getProvinceName());
slEquipmentVO.setProvinceCode(slStoreManagement.getProvinceCode());
slEquipmentVO.setCountyName(slStoreManagement.getCountyName());
--
Gitblit v1.7.1