From 0e19bbb301fd4efdcbf3285ade2a149db7d0a613 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期五, 15 八月 2025 18:34:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/jeecg/modules/base/service/impl/FactoryServiceImpl.java | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/jeecg/modules/base/service/impl/FactoryServiceImpl.java b/src/main/java/org/jeecg/modules/base/service/impl/FactoryServiceImpl.java
index 2307edd..9d4268d 100644
--- a/src/main/java/org/jeecg/modules/base/service/impl/FactoryServiceImpl.java
+++ b/src/main/java/org/jeecg/modules/base/service/impl/FactoryServiceImpl.java
@@ -6,7 +6,9 @@
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.IdWorker;
import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.SecurityUtils;
import org.jeecg.common.constant.CommonConstant;
+import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.base.entity.Factory;
import org.jeecg.modules.base.entity.UserFactory;
@@ -24,6 +26,7 @@
import javax.annotation.Resource;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collections;
import java.util.List;
@@ -176,10 +179,21 @@
}
@Override
- public List<Factory> queryProductionLineList() {
+ public List<Factory> queryUserProductionLineList() {
+ //鐢ㄦ埛鏁版嵁鏉冮檺
+ LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ if (sysUser == null) {
+ return Collections.emptyList();
+ }
+ String productionIds = sysUser.getProductionIds();
+ if(StringUtils.isBlank(productionIds)){
+ return Collections.emptyList();
+ }
+ List<String> list = Arrays.asList(productionIds.split(","));
LambdaQueryWrapper<Factory> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(Factory::getDelFlag, CommonConstant.DEL_FLAG_0);
- queryWrapper.eq(Factory::getFactoryCategory, "PRODUCTION_LINE");
+// queryWrapper.eq(Factory::getFactoryCategory, "PRODUCTION_LINE");
+ queryWrapper.in(Factory::getId, list);
queryWrapper.orderByAsc(Factory::getSorter);
return super.list(queryWrapper);
}
--
Gitblit v1.9.3