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

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

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

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

@@ -30,10 +30,7 @@
     </select>
 
     <select id="getBrandBindListWithPage" resultType="com.platform.entity.BrandEntity">
-        select brand.*,sysUser.username as bind_shower_name,userBrand.user_id as bind_shower_id
-         from nideshop_brand brand
-         left join sys_user_brand userBrand on ( userBrand.brand_id = brand.id and userBrand.enable = 1)
-         left join sys_user sysUser on (userBrand.user_id = sysUser.user_id)
+       select  * from nideshop_brand
          ${ew.customSqlSegment}
     </select>