getDeptId 返回list

platform-common/src/main/java/com/platform/controller/AbstractController.java

@@ -5,6 +5,9 @@ import com.platform.vos.CurrentUserLoginVo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * Controller公共组件
  *
@@ -23,7 +26,12 @@ public abstract class AbstractController {
         return getUser().getId();
     }
 
-    protected Long getDeptId() {
-        return getUser().getCompanyId();
+    protected  List<Long> getDeptId() {
+        Long companyId = getUser().getCompanyId();
+        List<Long> lists = new ArrayList<>();
+        if(companyId!=null){
+            lists.add(companyId);
+        }
+        return lists;
     }
 }

platform-shop/src/main/java/com/platform/controller/BrandController.java

@@ -110,7 +110,6 @@ public class BrandController extends AbstractController{
     public Result brandBindList(@RequestParam(name = "page") long page,@RequestHeader String token,
                            @RequestParam(name = "limit") long limit,
                            String sceneName,String brandName,Integer type,Integer livestreamStatus) {
-        List<Long> deptIdList = new ArrayList<>();
         Long userId = null;
         //如果不是超级管理员，则只能查询本部门及子部门数据
         List<Long> roleIdList = getUser().getRoleIdList();
@@ -122,11 +121,10 @@ public class BrandController extends AbstractController{
                 if(ObjectUtils.isEmpty(getUser().getCompanyId())){
                     return Result.failure("该账号未绑定公司！");
                 }
-                deptIdList.add(getDeptId());
             }
         }
         IPage<BrandEntity> resultPage = brandService.queryBrandBindList(page , limit , sceneName , brandName,
-                deptIdList ,type,userId,livestreamStatus);
+                getDeptId() ,type,userId,livestreamStatus);
         if(null == resultPage){
             return Result.failure("获取店铺绑定列表失败");
         }