From df4733091b30b0434a04dacd0e844663114d4cfe Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 09 七月 2025 17:51:56 +0800
Subject: [PATCH] 修改支付宝支付和bug修改

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

diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/DeptServiceImpl.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/DeptServiceImpl.java
index cbb7ddd..accf34e 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/DeptServiceImpl.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/DeptServiceImpl.java
@@ -1,7 +1,10 @@
 package com.dsh.guns.modular.system.service.impl;
 
+import java.sql.Array;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 import javax.annotation.Resource;
 
@@ -9,6 +12,10 @@
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.dsh.course.mapper.DeptMapper;
 import com.dsh.course.model.node.ZTreeNode;
+import com.dsh.guns.config.UserExt;
+import com.dsh.guns.modular.system.model.TStore;
+import com.dsh.guns.modular.system.service.IStoreService;
+import io.swagger.models.auth.In;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -21,6 +28,8 @@
 
     @Resource
     private DeptMapper deptMapper;
+    @Resource
+    private IStoreService storeService;
 
     @Override
     public void deleteDept(Integer deptId) {
@@ -38,11 +47,35 @@
 
     @Override
     public List<ZTreeNode> tree() {
-        return this.baseMapper.tree();
+        Integer objectType = UserExt.getUser().getObjectType();
+        Integer objectId = UserExt.getUser().getObjectId();
+        List<Integer> storeIds = new ArrayList<>();
+        if (objectType==2){
+            // 查询运营商下的门店ids
+            List<Integer> collect = storeService.lambdaQuery().eq(TStore::getOperatorId, objectId).list()
+                    .stream().map(TStore::getId).collect(Collectors.toList());
+            if (collect.isEmpty()){
+                storeIds.add(-1);
+            }
+            storeIds.addAll(collect);
+        }
+        return this.baseMapper.tree(UserExt.getUser().getObjectType(),UserExt.getUser().getObjectId(),storeIds);
     }
 
     @Override
     public List<Map<String, Object>> list(String condition) {
-        return this.baseMapper.list(condition);
+        Integer objectType = UserExt.getUser().getObjectType();
+        Integer objectId = UserExt.getUser().getObjectId();
+        List<Integer> storeIds = new ArrayList<>();
+        if (objectType==2){
+            // 查询运营商下的门店ids
+            List<Integer> collect = storeService.lambdaQuery().eq(TStore::getOperatorId, objectId).list()
+                    .stream().map(TStore::getId).collect(Collectors.toList());
+            if (collect.isEmpty()){
+                storeIds.add(-1);
+            }
+            storeIds.addAll(collect);
+        }
+        return this.baseMapper.list(condition,objectType,objectId,storeIds);
     }
 }

--
Gitblit v1.7.1