From b6ebb7d8e25fa5505494204abbc54da849ca548e Mon Sep 17 00:00:00 2001
From: nnnjjj123 <494715143@qq.com>
Date: Mon, 11 Jan 2021 17:14:22 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/jfptManager
---
src/main/java/org/springblade/modules/catalog/mapper/catalogMapper.xml | 9 +++++++--
1 files changed, 7 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 4491447..5e80035 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">
--
Gitblit v1.9.3