From 813b80aeea6829d082d6461da33894a99f07edba Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 18 May 2021 14:47:49 +0800
Subject: [PATCH] 1.新增根据用户编号查询用户信息接口 2.修复考勤导出信息中考勤类型缺失bug
---
blade-service/blade-system/src/main/java/org/springblade/system/mapper/TenantMapper.xml | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 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 9506719..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>
@@ -91,7 +98,7 @@
</select>
- <delete id="deletey">
+ <delete id="deletey">select
delete from jfpt.sys_hospital where hn = #{hn}
</delete>
<delete id="deletes">
@@ -100,4 +107,12 @@
<delete id="deleter">
delete from jfpt.sys_residential where hn = #{hn}
</delete>
+
+
+ <select id="selectListTe" resultType="java.util.HashMap">
+ select * from blade_tenant where is_deleted = 0 and tenant_id!=000000
+ <if test="type!=null and type!=''">
+ and tenant.type=#{tenant.type}
+ </if>
+ </select>
</mapper>
--
Gitblit v1.9.3