From 4372e6406222ce6b33f8c1c0703b460d39b5814e Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期一, 23 六月 2025 14:15:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
framework/src/main/java/cn/lili/modules/member/serviceimpl/StoreRoleServiceImpl.java | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/framework/src/main/java/cn/lili/modules/member/serviceimpl/StoreRoleServiceImpl.java b/framework/src/main/java/cn/lili/modules/member/serviceimpl/StoreRoleServiceImpl.java
index 0283f2b..6408262 100644
--- a/framework/src/main/java/cn/lili/modules/member/serviceimpl/StoreRoleServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/member/serviceimpl/StoreRoleServiceImpl.java
@@ -12,6 +12,7 @@
import cn.lili.modules.member.service.StoreDepartmentRoleService;
import cn.lili.modules.member.service.StoreMenuRoleService;
import cn.lili.modules.member.service.StoreRoleService;
+import cn.lili.mybatis.util.PageUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.beans.factory.annotation.Autowired;
@@ -29,7 +30,21 @@
@Service
@Transactional(rollbackFor = Exception.class)
public class StoreRoleServiceImpl extends ServiceImpl<StoreRoleMapper, StoreRole> implements StoreRoleService {
+ @Override
+ public List<StoreRole> getSelectList() {
+ String storeId = UserContext.getCurrentUser().getStoreId();
+// System.out.println(UserContext.getCurrentUser().getId());
+// System.out.println(storeId);
+// String storeId = "1376433565247471616";
+ if ( storeId == null) {
+ return null;
+ }
+ StoreRole storeRole = new StoreRole();
+ storeRole.setStoreId(storeId);
+
+ return this.list(PageUtil.initWrapper(storeRole));
+ }
/**
* 閮ㄩ棬瑙掕壊
*/
@@ -109,7 +124,8 @@
@Override
public List<StoreRole> list(List<String> ids) {
QueryWrapper<StoreRole> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("store_id", UserContext.getCurrentUser().getStoreId());
+ String storeId = UserContext.getCurrentUser().getStoreId();
+ queryWrapper.eq("store_id", storeId);
queryWrapper.in("id", ids);
return this.baseMapper.selectList(queryWrapper);
}
--
Gitblit v1.8.0