From cd2cfd37366002f790a2ed1435962d4eff7d5cec Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Tue, 01 Jun 2021 09:39:30 +0800
Subject: [PATCH] 版本合并
---
blade-service/blade-system/src/main/java/org/springblade/system/mapper/TenantMapper.xml | 37 ++++++++++++++++++++++---------------
1 files changed, 22 insertions(+), 15 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 7d69c90..c24f113 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_name=bd.dept_name
+ where bt.is_deleted = 0
+ AND bt.tenant_id != 000000
+
<if test="tenant.tenantName!=null and tenant.tenantName!=''">
and tenant_name=#{tenant.tenantName}
</if>
@@ -51,58 +58,58 @@
<!--医院信息新增-->
<insert id="inserts">
- insert into jfpt.sys_hospital(dj,had,ht,ctime,content,hn) values(#{dj},#{had},#{ht},#{ctime},#{content},#{hn})
+ insert into jfpt0.sys_hospital(dj,had,ht,ctime,content,hn) values(#{dj},#{had},#{ht},#{ctime},#{content},#{hn})
</insert>
<!--医院信息修改-->
<update id="updateInfoy" >
- UPDATE jfpt.sys_hospital SET dj=#{dj},had=#{had},ctime=#{ctime},content=#{content},ht=#{ht} WHERE hn=#{hn}
+ UPDATE jfpt0.sys_hospital SET dj=#{dj},had=#{had},ctime=#{ctime},content=#{content},ht=#{ht} WHERE hn=#{hn}
</update>
<select id="selectTy" resultType="java.util.HashMap">
- select * from jfpt.sys_hospital where hn=#{hn}
+ select * from jfpt0.sys_hospital where hn=#{hn}
</select>
<!--学校信息新增-->
<insert id="insertss">
- insert into jfpt.sys_school(nature,had,motto,ctime,content,hn) values(#{dj},#{had},#{motto},#{ctime},#{content},#{hn})
+ insert into jfpt0.sys_school(nature,had,motto,ctime,content,hn) values(#{nature},#{had},#{motto},#{ctime},#{content},#{hn})
</insert>
<!--学校信息修改-->
<update id="updateInfos" >
- UPDATE jfpt.sys_school SET nature=#{nature},had=#{had},ctime=#{ctime},content=#{content},motto=#{motto} WHERE hn=#{hn}
+ UPDATE jfpt0.sys_school SET nature=#{nature},had=#{had},ctime=#{ctime},content=#{content},motto=#{motto} WHERE hn=#{hn}
</update>
<select id="selectTs" resultType="java.util.HashMap">
- select * from jfpt.sys_school where hn=#{hn}
+ select * from jfpt0.sys_school where hn=#{hn}
</select>
<!--小区信息新增-->
<insert id="insertsr">
- insert into jfpt.sys_residential(category,attributes,developers,had,housetype,content,hn) values(#{category},#{attributes},#{developers},#{had},#{housetype},#{content},#{hn})
+ insert into jfpt0.sys_residential(category,attributes,developers,housetype,content,hn) values(#{category},#{attributes},#{developers},#{housetype},#{content},#{hn})
</insert>
<!--小区信息修改-->
<update id="updateInfor" >
- UPDATE jfpt.sys_residential SET category=#{category},attributes=#{attributes},developers=#{developers},had=#{had},housetype=#{housetype},content=#{content} WHERE hn=#{hn}
+ UPDATE jfpt0.sys_residential SET category=#{category},attributes=#{attributes},developers=#{developers},had=#{had},housetype=#{housetype},content=#{content} WHERE hn=#{hn}
</update>
<select id="selectTr" resultType="java.util.HashMap">
- select * from jfpt.sys_residential where hn=#{hn}
+ select * from jfpt0.sys_residential where hn=#{hn}
</select>
<delete id="deletey">
- delete from jfpt.sys_hospital where hn = #{hn}
+ delete from jfpt0.sys_hospital where hn = #{hn}
</delete>
<delete id="deletes">
- delete from jfpt.sys_school where hn = #{hn}
+ delete from jfpt0.sys_school where hn = #{hn}
</delete>
<delete id="deleter">
- delete from jfpt.sys_residential where hn = #{hn}
+ delete from jfpt0.sys_residential where hn = #{hn}
</delete>
- <select id="selectList" resultType="java.util.HashMap">
+ <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}
--
Gitblit v1.9.3