浏览代码

Merge remote-tracking branch 'origin/dev' into dev

赵冬冬 4 年之前
父节点
当前提交
09c456fdc4
共有 1 个文件被更改,包括 1 次插入1 次删除
  1. 1 1
      forest-admin/admin-server/src/main/resources/dao/BigCompanyDao.xml

+ 1 - 1
forest-admin/admin-server/src/main/resources/dao/BigCompanyDao.xml

@@ -111,7 +111,7 @@
 
 
             FROM
             FROM
                 pms_product b
                 pms_product b
-                LEFT JOIN pms_product_category c ON b.product_category_id = c.id 								GROUP BY c.id,b.ums_company_info_id
+                LEFT JOIN pms_product_category c ON b.product_category_id = c.id WHERE b.product_category_id IS NOT NULL GROUP BY c.parent_id,b.ums_company_info_id
 								union all
 								union all
 
 
 								SELECT
 								SELECT