From 9a8d9ef43c70fe6d70b494f49b19e5ca6ef01d4b Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期五, 14 三月 2025 17:52:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/PermissionStreamNewServiceImpl.java | 24 ++++++++++++++++++++----
1 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/PermissionStreamNewServiceImpl.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/PermissionStreamNewServiceImpl.java
index 87c16f7..a41ec75 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/PermissionStreamNewServiceImpl.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/PermissionStreamNewServiceImpl.java
@@ -6,7 +6,6 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.commons.collections4.ListUtils;
-import org.jeecg.modules.dnc.entity.PermissionStream;
import org.jeecg.modules.dnc.entity.PermissionStreamNew;
import org.jeecg.modules.dnc.entity.ProductMix;
import org.jeecg.modules.dnc.mapper.PermissionStreamNewMapper;
@@ -25,8 +24,17 @@
* @return
*/
@Override
- public List<ProductMix> loadProductMix(String userId){
- return baseMapper.loadProductMix(userId);
+ public List<ProductMix> loadProductMix(String userId,List<String> productIdList){
+ return baseMapper.loadProductMix(userId,productIdList);
+ }
+
+ /**
+ * 绠＄悊鍛樿幏鍙栨墍鏈夋潈闄�
+ * @return
+ */
+ @Override
+ public List<ProductMix> loadProductMixAll(String userId){
+ return baseMapper.loadProductMixAll(userId);
}
/**
@@ -139,7 +147,15 @@
permissionStreamNewList.forEach(item -> {
ids.add(item.getId());
});
- return super.removeByIds(ids);
+ if (ids.size()>1000) {
+ List<List<String>> partition = ListUtils.partition(ids, 1000);
+ for (List<String> partitionList : partition) {
+ super.removeByIds(partitionList);
+ }
+ }else {
+ super.removeByIds(ids);
+ }
+ return true;
}
/**
--
Gitblit v1.9.3