From ae38b2b65b709ac576eec2b507c92008a7afc3de Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Tue, 27 Apr 2021 09:26:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
blade-service/blade-system/src/main/java/org/springblade/system/mapper/TenantMapper.xml | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/TenantMapper.xml b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/TenantMapper.xml
index beb426c..f2173fb 100644
--- a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/TenantMapper.xml
+++ b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/TenantMapper.xml
@@ -30,8 +30,15 @@
</resultMap>
- <select id="selectTenantPage" resultMap="tenantResultMap">
- select * from blade_tenant where is_deleted = 0 and tenant_id!=000000
+ <select id="selectTenantPage" resultType="org.springblade.system.vo.TenantVo">
+ select bt.*,bd.id deptId from blade_tenant bt
+ left join
+ blade_dept bd
+ on
+ bt.tenant_id=bd.tenant_id
+ where bt.is_deleted = 0
+ and bt.tenant_id!=000000
+ and bd.dept_category=1
<if test="tenant.tenantName!=null and tenant.tenantName!=''">
and tenant_name=#{tenant.tenantName}
</if>
--
Gitblit v1.9.3