http://192.168.0.21/index.php?m=bug&f=view&bugID=25814

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

@@ -114,9 +114,9 @@ public class BrandController extends AbstractController{
         Long userId = null;
         //如果不是超级管理员，则只能查询本部门及子部门数据
         List<Long> roleIdList = getUser().getRoleIdList();
-        if (!roleIdList.contains(1L) && !roleIdList.contains(5L) && !roleIdList.contains(9L) ) {
+        if (!roleIdList.contains(1L) && !roleIdList.contains(5L)  ) {
             // 公司员工只能看到已经绑定自身为主播的数据
-            if (roleIdList.contains(8L)) {
+            if (roleIdList.contains(8L) || roleIdList.contains(9L)) {
                 userId = getUserId();
             }else{
                 if(ObjectUtils.isEmpty(getUser().getCompanyId())){

platform-shop/src/main/java/com/platform/service/impl/BrandServiceImpl.java

@@ -81,28 +81,28 @@ public class BrandServiceImpl implements BrandService {
                                                  List<Long> deptIdList , Integer type,Long userId,Integer livestreamStatus,String orderBy) {
         QueryWrapper<BrandEntity> queryWrapper = new QueryWrapper<>();
         if(org.apache.commons.lang3.StringUtils.isNotBlank(sceneName)){
-            queryWrapper.like("name" , sceneName);
+            queryWrapper.like("b.name" , sceneName);
         }
         //添加是否绑定的过滤条件
         if(!ObjectUtils.isEmpty(userId)){
             //捞取已经绑定的
-            queryWrapper.eq("create_user_id",userId);
+            queryWrapper.and(query->query.eq("b.create_user_id",userId).or().eq("u.user_id",userId));
         }
         if(!CollectionUtils.isEmpty(deptIdList)){
-            queryWrapper.in("create_user_dept_id" , deptIdList);
+            queryWrapper.in("b.create_user_dept_id" , deptIdList);
         }
         if(!ObjectUtils.isEmpty(type)){
-            queryWrapper.eq("type",type);
+            queryWrapper.eq("b.type",type);
         }
         if(!ObjectUtils.isEmpty(livestreamStatus)){
-            queryWrapper.eq("livestream_status",livestreamStatus);
+            queryWrapper.eq("b.livestream_status",livestreamStatus);
         }
-        queryWrapper.groupBy("id");
+        queryWrapper.groupBy("b.id");
         //这里投机取巧使用id来代替创建时间来做倒序，历史原因，原来的表没创建时间这个字段
         if(StringUtils.isNotBlank(orderBy)){
-            queryWrapper.last("order by "+ orderBy);
+            queryWrapper.last("order by b."+ orderBy);
         }else {
-            queryWrapper.orderByDesc("id");
+            queryWrapper.orderByDesc("b.id");
         }
         IPage<BrandEntity> page = new Page<>(pageNum , pageSize);
         IPage<BrandEntity> resultPage = new Page<>();

platform-shop/src/main/resources/com/platform/dao/BrandDao.xml

@@ -30,7 +30,8 @@
     </select>
 
     <select id="getBrandBindListWithPage" resultType="com.platform.entity.BrandEntity">
-       select  * from nideshop_brand
+       select  b.* from nideshop_brand b
+       LEFT JOIN sys_user_brand u on b.id = u.brand_id
          ${ew.customSqlSegment}
     </select>