From b3221701c387ab536adf66cf315c75d3b429fe04 Mon Sep 17 00:00:00 2001
From: 刘帅 <rr.iii@qq.com>
Date: 星期四, 17 九月 2026 09:38:06 +0800
Subject: [PATCH] feat&bug:文档问题修改及优化

---
 cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/RoleServiceImpl.java |   20 ++------------------
 1 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/RoleServiceImpl.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/RoleServiceImpl.java
index 08db44e..19af8f0 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/RoleServiceImpl.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/RoleServiceImpl.java
@@ -1,9 +1,7 @@
 package com.dsh.guns.modular.system.service.impl;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 import javax.annotation.Resource;
 
@@ -13,8 +11,6 @@
 import com.dsh.course.model.node.ZTreeNode;
 import com.dsh.guns.config.UserExt;
 import com.dsh.guns.modular.system.controller.util.Convert;
-import com.dsh.guns.modular.system.model.TStore;
-import com.dsh.guns.modular.system.service.IStoreService;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -68,26 +64,14 @@
     public int deleteRolesById(Integer roleId) {
         return this.baseMapper.deleteRolesById(roleId);
     }
-    @Resource
-    private IStoreService storeService;
     @Override
     public List<ZTreeNode> roleTreeList(Integer type,Integer id) {
-        List<Integer> storeIds = new ArrayList<>();
-        if (type==2){
-            // 查询运营商下的门店ids
-            List<Integer> collect = storeService.lambdaQuery().eq(TStore::getOperatorId, id).list()
-                    .stream().map(TStore::getId).collect(Collectors.toList());
-            if (collect.isEmpty()){
-                storeIds.add(-1);
-            }
-            storeIds.addAll(collect);
-        }
-        return this.baseMapper.roleTreeList(type,id,storeIds);
+        return this.baseMapper.roleTreeList(type, id, UserExt.getUser().getId());
     }
 
     @Override
     public List<ZTreeNode> roleTreeListByRoleId(String[] roleId,Integer type,Integer id) {
-        return this.baseMapper.roleTreeListByRoleId(roleId,type,id);
+        return this.baseMapper.roleTreeListByRoleId(roleId, type, id, UserExt.getUser().getId());
     }
 
 }

--
Gitblit v1.7.1