From 642414e16907bdd2a47642a9a83c1bc002c6b081 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Thu, 12 Aug 2021 20:49:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml b/src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml
index e007344..6eb943b 100644
--- a/src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml
@@ -166,6 +166,7 @@
dept.dept_name AS label,
dept.id AS "key",
dept.id AS "value",
+ 1 as idCardNo,
(
SELECT
CASE WHEN count(1) > 0 THEN 1 ELSE 0 END
@@ -205,6 +206,7 @@
bu.real_name AS label,
bu.id AS "key",
bu.id AS "value",
+ bu.cardid as idCardNo,
0 as "has_children"
from blade_user bu
left join
--
Gitblit v1.9.3