From 1540ac0da71a0f9cd8160949f76e626af9204f13 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Sun, 25 Apr 2021 11:53:27 +0800
Subject: [PATCH] 1.用户列表修改
---
blade-service/blade-system/src/main/java/org/springblade/system/mapper/TenantMapper.xml | 4 ++--
blade-service/blade-system/src/main/java/org/springblade/system/controller/TenantController.java | 6 +++---
blade-service/blade-system/src/main/java/org/springblade/system/service/impl/TenantServiceImpl.java | 4 ++--
blade-service/blade-system/src/main/java/org/springblade/system/service/ITenantService.java | 2 +-
blade-service/blade-system/src/main/java/org/springblade/system/mapper/TenantMapper.java | 2 +-
5 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/controller/TenantController.java b/blade-service/blade-system/src/main/java/org/springblade/system/controller/TenantController.java
index 86fbfe9..7fe643f 100644
--- a/blade-service/blade-system/src/main/java/org/springblade/system/controller/TenantController.java
+++ b/blade-service/blade-system/src/main/java/org/springblade/system/controller/TenantController.java
@@ -296,9 +296,9 @@
- @PostMapping("/selectList")
- public R selectList(String type) {
- List<Map<String, Object>> list = tenantService.selectList(type);
+ @PostMapping("/selectListTe")
+ public R selectListTe(String type) {
+ List<Map<String, Object>> list = tenantService.selectListTe(type);
for (int i=0;i<list.size();i++){
//医院
if (list.get(i).get("type").equals("0")){
diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/TenantMapper.java b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/TenantMapper.java
index 2fac36c..b59eb93 100644
--- a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/TenantMapper.java
+++ b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/TenantMapper.java
@@ -38,7 +38,7 @@
* @return
*/
List<Tenant> selectTenantPage(IPage page, Tenant tenant);
- List<Map<String, Object>> selectList(String type);
+ List<Map<String, Object>> selectListTe(String type);
int inserts(String dj, String had, String ht, String ctime,String content,String hn);
void updateInfoy(String dj, String had, String ht, String ctime,String content,String hn);
List<Map<String, Object>> selectTy(String hn);
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..beb426c 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
@@ -91,7 +91,7 @@
</select>
- <delete id="deletey">
+ <delete id="deletey">select
delete from jfpt.sys_hospital where hn = #{hn}
</delete>
<delete id="deletes">
@@ -102,7 +102,7 @@
</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}
diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/service/ITenantService.java b/blade-service/blade-system/src/main/java/org/springblade/system/service/ITenantService.java
index 909bc0b..09c75f4 100644
--- a/blade-service/blade-system/src/main/java/org/springblade/system/service/ITenantService.java
+++ b/blade-service/blade-system/src/main/java/org/springblade/system/service/ITenantService.java
@@ -85,5 +85,5 @@
void deletey(String hn);
void deletes(String hn);
void deleter(String hn);
- List<Map<String, Object>> selectList(String type);
+ List<Map<String, Object>> selectListTe(String type);
}
diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/TenantServiceImpl.java b/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/TenantServiceImpl.java
index 3bf6a51..dc2824a 100644
--- a/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/TenantServiceImpl.java
+++ b/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/TenantServiceImpl.java
@@ -254,8 +254,8 @@
}
@Override
- public List<Map<String, Object>> selectList(String type) {
- return baseMapper.selectList(type);
+ public List<Map<String, Object>> selectListTe(String type) {
+ return baseMapper.selectListTe(type);
}
private String getTenantId(List<String> codes) {
--
Gitblit v1.9.3