From b78ae331ff607e80bc43ce686c25ed2aaf586617 Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期四, 18 七月 2024 18:56:11 +0800
Subject: [PATCH] 森林防火 供应商管理
---
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlGoodsShelfServiceImpl.java | 30 +++++++++++++++++++++++++++++-
1 files changed, 29 insertions(+), 1 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 78b949f..202a013 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
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.utils.page.PageDTO;
+import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.management.domain.SlGoodsShelf;
import com.ruoyi.management.domain.SlStoreManagement;
import com.ruoyi.management.domain.dto.GoodsShelfDTO;
@@ -15,6 +16,8 @@
import com.ruoyi.management.service.SlGoodsShelfService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.management.service.SlStoreManagementService;
+import com.ruoyi.system.api.domain.SysUser;
+import com.ruoyi.system.api.feignClient.SysUserClient;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@@ -35,14 +38,24 @@
@Resource
private SlStoreManagementService SlStoreManagementService;
+
+ @Resource
+ private SysUserClient sysUserClient;
+
+
@Override
public PageDTO<SlGoodsShelfVO> getGoodsShelfList(SlGoodsShelfQuery slGoodsShelfQuery) {
+ Long userid = SecurityUtils.getUserId();
+ SysUser data = sysUserClient.getSysUser(userid).getData();
LambdaQueryWrapper<SlStoreManagement> wrapper= Wrappers.lambdaQuery();
- wrapper.eq(SlStoreManagement::getStoreManagementName,slGoodsShelfQuery.getStoreManagementName());
+ if(slGoodsShelfQuery.getStoreManagementName()!=null){
+ 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;
@@ -136,4 +149,19 @@
List<SlGoodsShelf> page2 = this.list(wrapper1);
return page2;
}
+
+ @Override
+ public List<SlGoodsShelf> getGoodsSheManagementlfList(SlGoodsShelfQuery slGoodsShelfQuery) {
+ LambdaQueryWrapper< SlGoodsShelf> wrapper1= Wrappers.lambdaQuery();
+ if (slGoodsShelfQuery.getStoreManagementId()!=null){
+ wrapper1.eq(SlGoodsShelf::getStoreManagementId,slGoodsShelfQuery.getStoreManagementId());
+ }
+ if (slGoodsShelfQuery.getStoreManagementNumber()!=null){
+ wrapper1.eq(SlGoodsShelf::getStoreManagementNumber,slGoodsShelfQuery.getStoreManagementNumber());
+ }
+ wrapper1.eq( SlGoodsShelf::getDelFlag,0);
+ wrapper1.orderByDesc(SlGoodsShelf::getCreateTime);
+ List<SlGoodsShelf> page2 = this.list(wrapper1);
+ return page2;
+ }
}
--
Gitblit v1.7.1