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/ManagementGoodsMaterialsServiceImpl.java | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/ManagementGoodsMaterialsServiceImpl.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/ManagementGoodsMaterialsServiceImpl.java
index 15c634d..c7fcd92 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/ManagementGoodsMaterialsServiceImpl.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/ManagementGoodsMaterialsServiceImpl.java
@@ -18,6 +18,7 @@
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
+import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
@@ -46,19 +47,19 @@
@Override
public PageDTO<ManagementGoodsMaterialsVO> getManagementGoodsMaterialsList(ManagementGoodsMaterialsQuery managementGoodsMaterialsQuery) {
LambdaQueryWrapper<SlStoreManagement> wrapper= Wrappers.lambdaQuery();
- if (managementGoodsMaterialsQuery.getStoreManagementName()!=null){
+ if (managementGoodsMaterialsQuery.getStoreManagementName()!=null&&managementGoodsMaterialsQuery.getStoreManagementName()!=""){
wrapper.like(SlStoreManagement::getStoreManagementName,managementGoodsMaterialsQuery.getStoreManagementName());
}
- if (managementGoodsMaterialsQuery.getStoreManagementNo()!=null){
+ if (managementGoodsMaterialsQuery.getStoreManagementNo()!=null&&managementGoodsMaterialsQuery.getStoreManagementNo()!=""){
wrapper.eq(SlStoreManagement::getStoreManagementNo,managementGoodsMaterialsQuery.getStoreManagementNo());
}
- if (managementGoodsMaterialsQuery.getCityCode()!=null){
+ if (managementGoodsMaterialsQuery.getCityCode()!=null&&managementGoodsMaterialsQuery.getCityCode()!=""){
wrapper.eq(SlStoreManagement::getCityCode,managementGoodsMaterialsQuery.getCityCode());
}
- if (managementGoodsMaterialsQuery.getCountyCode()!=null){
+ if (managementGoodsMaterialsQuery.getCountyCode()!=null&&managementGoodsMaterialsQuery.getCountyCode()!=""){
wrapper.eq(SlStoreManagement::getCountyCode,managementGoodsMaterialsQuery.getCountyCode());
}
- if (managementGoodsMaterialsQuery.getTownCode()!=null){
+ if (managementGoodsMaterialsQuery.getTownCode()!=null&&managementGoodsMaterialsQuery.getTownCode()!=""){
wrapper.eq(SlStoreManagement::getTownCode,managementGoodsMaterialsQuery.getTownCode());
}
List<SlStoreManagement> slStoreManagements = slStoreManagementMapper.selectList(wrapper);
@@ -67,7 +68,7 @@
.collect(Collectors.toSet());
LambdaQueryWrapper<SlGoodsMaterials> wrapper1= Wrappers.lambdaQuery();
- if (managementGoodsMaterialsQuery.getGoodsMaterialsName()!=null){
+ if (managementGoodsMaterialsQuery.getGoodsMaterialsName()!=null&&managementGoodsMaterialsQuery.getGoodsMaterialsName()!=""){
wrapper1.like(SlGoodsMaterials::getGoodsMaterialsName,managementGoodsMaterialsQuery.getGoodsMaterialsName());
}
@@ -83,8 +84,16 @@
if (slVolumeProductionIdList.size()>0){
wrapper3.in(ManagementGoodsMaterials::getManagementId,slVolumeProductionIdList);
+ }else{
+ slVolumeProductionIdList=new HashSet<>();
+ slVolumeProductionIdList.add(0L);
+ wrapper3.in(ManagementGoodsMaterials::getGoodsMaterialsId,slVolumeProductionIdList);
}
if (SlGoodsMaterialsList.size()>0){
+ wrapper3.in(ManagementGoodsMaterials::getGoodsMaterialsId,SlGoodsMaterialsList);
+ }else{
+ SlGoodsMaterialsList=new HashSet<>();
+ SlGoodsMaterialsList.add(0L);
wrapper3.in(ManagementGoodsMaterials::getGoodsMaterialsId,SlGoodsMaterialsList);
}
wrapper3.apply("repertory_zhai<repertory");
@@ -101,6 +110,7 @@
SlStoreManagement slStoreManagement = slStoreManagementMapper.selectById(li.getManagementId());
li.setProvinceCode(slStoreManagement.getProvinceCode());
+ li.setStoreManagementName(slStoreManagement.getStoreManagementName());
li.setProvinceName(slStoreManagement.getProvinceName());
li.setCityCode(slStoreManagement.getCityCode());
li.setCityName(slStoreManagement.getCityName());
--
Gitblit v1.7.1