Ver código fonte

修改接口校验逻辑

tianboguang 3 anos atrás
pai
commit
154298c375

+ 7 - 4
platform-shop/src/main/java/com/platform/controller/BrandController.java

@@ -108,20 +108,23 @@ public class BrandController extends AbstractController{
     @ApiOperation(value = "店铺绑定情况列表")
     @GetMapping("/brandBindList")
     @RequiresPermissions("brand:list")
-    public R brandBindList(@RequestParam(name = "deptId") long deptId,
-                           @RequestParam(name = "page") long page,
+    public R brandBindList(@RequestParam(name = "page") long page,
                            @RequestParam(name = "limit") long limit,
                            String sceneName,String brandName,Integer type,Integer livestreamStatus) {
         List<Long> deptIdList = null;
         Long userId = null;
         //如果不是超级管理员,则只能查询本部门及子部门数据
         if (getUserId() != Constant.SUPER_ADMIN) {
-            // 公司管理员
             Long roleId = getUser().getRoleId();
-            deptIdList = departmentUtils.getAllSubDeptIds(deptId);
             // 公司员工只能看到已经绑定自身为主播的数据
             if (roleId == 8) {
                 userId = getUserId();
+            }else{
+                if(ObjectUtils.isEmpty(getUser().getDeptId())){
+                    return R.error("该账号未绑定公司!");
+                }
+                // 公司管理员
+                deptIdList = departmentUtils.getAllSubDeptIds(getUser().getDeptId());
             }
         }
         IPage<BrandEntity> resultPage = brandService.queryBrandBindList(page , limit , sceneName , brandName,