修复分类bug

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

@@ -70,60 +70,46 @@
 
     </select>
     <select id="getCat" resultType="java.lang.String">
---         SELECT
---             CONCAT(a.id,'---',a.name,'---',IFNULL(SUM(d.numm),0)) as cat
---         FROM
---             pms_product_category a
---             LEFT JOIN (
---             SELECT
---                 b.ums_company_info,
---                 b.ums_company_info_id,
---                 c.parent_id,
---             CASE IFNULL(b.ums_company_info_id,-1)
---             WHEN  -1 THEN
---                 0
---             ELSE
---                 1
---         END as numm
---
---             FROM
---                 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
---             ) d ON a.id = d.parent_id
---         GROUP BY
---             a.id
-
-            SELECT
-            CONCAT(a.id,'---',a.name,'---',IFNULL(SUM(d.numm),0)) as cat
-        FROM
-            pms_product_category a
-            LEFT JOIN (
-            SELECT
-                b.ums_company_info,
-                b.ums_company_info_id,
-                c.parent_id,
-            CASE IFNULL(b.ums_company_info_id,-1)
-            WHEN  -1 THEN
-                0
-            ELSE
-                1
-        END as numm
-
-            FROM
-                pms_product b
-                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
-
-								SELECT
-									xxx.comp_name AS ums_company_info,
-									xxx.id AS ums_company_info_id,
-									xxx.product_category_id AS parent_id,
-									1 AS numm
-								FROM
-									ums_company_info_ext xxx
-            ) d ON a.id = d.parent_id
-        GROUP BY
-            a.id
+SELECT
+	CONCAT(
+		a.id,
+		'---',
+		a. NAME,
+		'---',
+		IFNULL(SUM(d.numm), 0)
+	) AS cat
+FROM
+	pms_product_category a
+LEFT JOIN (
+	SELECT
+		b.comp_name,
+		b.comp_id,
+		c.parent_id,
+		CASE IFNULL(b.comp_id ,- 1)
+	WHEN - 1 THEN
+		0
+	ELSE
+		1
+	END AS numm
+	FROM
+		pms_product b
+	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.comp_id
+	UNION ALL
+		SELECT
+			xxx.comp_name AS ums_company_info,
+			xxx.id AS ums_company_info_id,
+			xxx.product_category_id AS parent_id,
+			1 AS numm
+		FROM
+			ums_company_info_ext xxx
+) d ON a.id = d.parent_id
+GROUP BY
+	a.id
 
     </select>
 </mapper>