From 425e388128ba159fb9ff714d6bde24caa25e85ef Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期二, 30 七月 2024 18:03:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlGoodsShelfServiceImpl.java | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlGoodsShelfServiceImpl.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlGoodsShelfServiceImpl.java
index 134822b..7c45a7e 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlGoodsShelfServiceImpl.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlGoodsShelfServiceImpl.java
@@ -20,6 +20,7 @@
import com.ruoyi.system.api.domain.SysUser;
import com.ruoyi.system.api.feignClient.SysUserClient;
import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
import javax.annotation.Resource;
import java.util.HashSet;
@@ -51,13 +52,12 @@
SysUser data = sysUserClient.getSysUser(userid).getData();
LambdaQueryWrapper<SlStoreManagement> wrapper= Wrappers.lambdaQuery();
- if(slGoodsShelfQuery.getStoreManagementName()!=null&&slGoodsShelfQuery.getStoreManagementName()!=""){
- wrapper.eq(SlStoreManagement::getStoreManagementName,slGoodsShelfQuery.getStoreManagementName());
+ if(slGoodsShelfQuery.getStoreManagementName()!=null&& !slGoodsShelfQuery.getStoreManagementName().isEmpty()){
+ wrapper.like(SlStoreManagement::getStoreManagementName,slGoodsShelfQuery.getStoreManagementName());
}
- if (slGoodsShelfQuery.getStoreManagementNumber()!=0 && slGoodsShelfQuery.getStoreManagementNumber()!=null){
- wrapper.eq(SlStoreManagement::getStoreManagementGrade,slGoodsShelfQuery.getStoreManagementNumber());
+ if (data.getRoleType()!=1){
+ wrapper.eq(SlStoreManagement::getStoreManagementGrade,data.getRoleType());
}
- wrapper.eq(SlStoreManagement::getStoreManagementGrade,data.getRoleType());
wrapper.eq(SlStoreManagement::getDelFlag,0);
List<SlStoreManagement> page1 = SlStoreManagementService.list(wrapper);
Set<Long> slStoreManagementIdList = null;
@@ -67,7 +67,12 @@
Page<SlGoodsShelf> page = new Page<>(slGoodsShelfQuery.getPageCurr(), slGoodsShelfQuery.getPageSize());
LambdaQueryWrapper< SlGoodsShelf> wrapper1= Wrappers.lambdaQuery();
- wrapper1.like(SlGoodsShelf::getGoodsShelfName,slGoodsShelfQuery.getGoodsShelfName());
+ if (StringUtils.hasLength(slGoodsShelfQuery.getGoodsShelfName())){
+ wrapper1.like(SlGoodsShelf::getGoodsShelfName,slGoodsShelfQuery.getGoodsShelfName());
+ }
+ if (slGoodsShelfQuery.getStoreManagementNumber()!=null){
+ wrapper1.eq(SlGoodsShelf::getStoreManagementNumber,slGoodsShelfQuery.getStoreManagementNumber());
+ }
if(slGoodsShelfQuery.getStoreManagementName()!=null&&slGoodsShelfQuery.getStoreManagementName()!="") {
if (slStoreManagementIdList.size() > 0) {
wrapper1.in(SlGoodsShelf::getStoreManagementId, slStoreManagementIdList);
@@ -87,7 +92,6 @@
SlStoreManagement byId = SlStoreManagementService.getById(list.getStoreManagementId());
if (byId!=null){
list.setStoreManagementName(byId.getStoreManagementName());
- list.setStoreManagementNumber(byId.getStoreManagementNumber());
list.setProvinceName(byId.getProvinceName());
list.setProvinceCode(byId.getProvinceCode());
list.setCityName(byId.getCityName());
--
Gitblit v1.7.1