From 49e023b28af6d32dad613c19eb6eb2701cdcc040 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Thu, 14 Jan 2021 15:37:29 +0800
Subject: [PATCH] 客户列表接口修改

---
 src/main/java/org/springblade/modules/catalog/mapper/catalogMapper.xml |   15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/springblade/modules/catalog/mapper/catalogMapper.xml b/src/main/java/org/springblade/modules/catalog/mapper/catalogMapper.xml
index 4491447..613ed16 100644
--- a/src/main/java/org/springblade/modules/catalog/mapper/catalogMapper.xml
+++ b/src/main/java/org/springblade/modules/catalog/mapper/catalogMapper.xml
@@ -15,8 +15,13 @@
         SELECT id,name,pId FROM `sys_catalog`
     </select>
 
-    <select id="selectCatalogEqNUmber" resultType="java.lang.String">
-        SELECT GROUP_CONCAT(eqid) FROM sys_catalog WHERE pId=#{pid} and eqid is NOT NULL;
+    <select id="selectCatalogEqNUmber" resultType="java.util.HashMap">
+
+        SELECT
+            *
+        FROM
+            sys_catalog
+
     </select>
 
     <select id="selectCount" resultType="java.util.HashMap">
@@ -47,7 +52,7 @@
 	d.addvnm as name
 FROM
 	sys_suser s
-	LEFT JOIN sys_district d ON d.addvcds = s.addvcd
+	INNER JOIN sys_district d ON d.addvcds = s.addvcd
 GROUP BY
 	s.addvcd
     </select>
@@ -58,13 +63,13 @@
 	d.addvnm as name
 FROM
 	sys_equipment s
-	LEFT JOIN sys_district d ON d.addvcds = s.addvcd
+	INNER JOIN sys_district d ON d.addvcds = s.addvcd
 	WHERE s.parent_id!=0
 GROUP BY
 	s.addvcd
     </select>
     <select id="selectWar" resultType="java.util.HashMap">
-     SELECT COUNT(*) as cou,waringType FROM `sys_alarm` GROUP BY waringType
+     SELECT COUNT(*) as cou,waringType FROM `sys_alarm` GROUP BY waringType ORDER BY cou desc
     </select>
 
 

--
Gitblit v1.9.3