From db0b070e51db46e779b8d2ad1d4d213b712602cd Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Mon, 11 Jan 2021 17:04:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
src/main/java/org/springblade/modules/catalog/mapper/catalogMapper.xml | 30 ++++++++++++++++++++++++++++--
1 files changed, 28 insertions(+), 2 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 4afa08e..2a0a85a 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,34 @@
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">
+ SELECT
+ COUNT( * ) AS counta
+FROM
+ sys_alarm UNION
+SELECT
+ COUNT( * )
+FROM
+ sys_equipment
+WHERE
+ parent_id != 0 UNION
+SELECT
+ COUNT( * )
+FROM
+ sys_suser UNION
+SELECT
+ COUNT( * )
+FROM
+ sys_security WHERE type=1
</select>
--
Gitblit v1.9.3