From 9f8f9d13c42ca8cdccbf351069082a5fdccef2e4 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Mon, 25 Mar 2024 17:30:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/label/mapper/LabelMapper.xml | 36 ++++++++++++++++++++++++++++++++++--
1 files changed, 34 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/label/mapper/LabelMapper.xml b/src/main/java/org/springblade/modules/label/mapper/LabelMapper.xml
index 3f51075..d1acea0 100644
--- a/src/main/java/org/springblade/modules/label/mapper/LabelMapper.xml
+++ b/src/main/java/org/springblade/modules/label/mapper/LabelMapper.xml
@@ -30,10 +30,40 @@
<!--标签查询，按父id查询下级-->
<select id="getLabelList" resultType="org.springblade.common.node.TreeIntegerNode">
SELECT
- jl.id as id,jl.parent_id as parentId,jl.label_name as name
+ jl.id as id,jl.parent_id as parentId,jl.label_name as name,
+ (
+ SELECT
+ CASE WHEN count(1) > 0 THEN 1 ELSE 0 END
+ FROM
+ jczz_label
+ WHERE
+ parent_id = jl.id and is_deleted = 0
+ ) AS hasChildren
FROM
jczz_label jl
- where parent_id = #{label.parentId}
+ where is_deleted = 0
+ and parent_id = #{label.parentId}
+ </select>
+
+ <!--标签查询，按父id查询下级-->
+ <select id="getChildrenLabelList" resultType="org.springblade.common.node.TreeIntegerNode">
+ SELECT
+ jl.id as id,jl.parent_id as parentId,jl.label_name as name,
+ (
+ SELECT
+ CASE WHEN count(1) > 0 THEN 1 ELSE 0 END
+ FROM
+ jczz_label
+ WHERE
+ parent_id = jl.id and is_deleted = 0
+ ) AS hasChildren
+ FROM
+ jczz_label jl
+ where is_deleted = 0
+ and parent_id in
+ <foreach collection="list" separator="," item="id" open="(" close=")">
+ #{id}
+ </foreach>
</select>
@@ -46,6 +76,8 @@
(SELECT count(1) from jczz_user_house_label where label_id = jl.id ) count
FROM
jczz_label jl where is_deleted = 0
+ and jl.id != '1002'
+ order by jl.sort desc
</select>
--
Gitblit v1.9.3