From 4a0c56352223553481e1122665964546a39cddf5 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 30 七月 2024 16:13:42 +0800
Subject: [PATCH] 代码提交 依赖整理 bug解决
---
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlGoodsShelfServiceImpl.java | 56 +++++++++++---------------------------------------------
1 files changed, 11 insertions(+), 45 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 b66f156..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());
@@ -100,44 +104,6 @@
}
return SlGoodsShelfDTO;
- }
-
- @Override
- public List<SlGoodsShelf> getBGoodsShelfList(SlGoodsShelfQuery slGoodsShelfQuery) {
- Long userid = SecurityUtils.getUserId();
- 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.getStoreManagementNumber()!=0 && slGoodsShelfQuery.getStoreManagementNumber()!=null){
- wrapper.eq(SlStoreManagement::getStoreManagementGrade,slGoodsShelfQuery.getStoreManagementNumber());
- }
- wrapper.eq(SlStoreManagement::getStoreManagementGrade,data.getRoleType());
- wrapper.eq(SlStoreManagement::getDelFlag,0);
- List<SlStoreManagement> page1 = SlStoreManagementService.list(wrapper);
- Set<Long> slStoreManagementIdList = null;
- slStoreManagementIdList = page1.stream().map(SlStoreManagement::getId)
- .collect(Collectors.toSet());
-
-
- LambdaQueryWrapper< SlGoodsShelf> wrapper1= Wrappers.lambdaQuery();
- wrapper1.like(SlGoodsShelf::getGoodsShelfName,slGoodsShelfQuery.getGoodsShelfName());
- if(slGoodsShelfQuery.getStoreManagementName()!=null&&slGoodsShelfQuery.getStoreManagementName()!="") {
- if (slStoreManagementIdList.size() > 0) {
- wrapper1.in(SlGoodsShelf::getStoreManagementId, slStoreManagementIdList);
- } else {
- slStoreManagementIdList=new HashSet<>();
- slStoreManagementIdList.add(0L);
- wrapper1.in(SlGoodsShelf::getStoreManagementId, slStoreManagementIdList);
- }
- }
- wrapper1.eq( SlGoodsShelf::getDelFlag,0);
- wrapper1.orderByDesc(SlGoodsShelf::getCreateTime);
- List<SlGoodsShelf> page2 = this.list(wrapper1);
-
- return page2;
}
@Override
--
Gitblit v1.7.1