From 0bcad3887ff80ec0b2624fa39680fbac377ef249 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Sun, 22 Aug 2021 15:48:20 +0800
Subject: [PATCH] 1.单位
---
src/main/java/org/springblade/modules/jurisdiction/controller/JurisdictionController.java | 2 +-
src/main/java/org/springblade/modules/information/entity/Information.java | 4 ++--
src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml | 4 +++-
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/springblade/modules/information/entity/Information.java b/src/main/java/org/springblade/modules/information/entity/Information.java
index 094ae2f..b27f233 100644
--- a/src/main/java/org/springblade/modules/information/entity/Information.java
+++ b/src/main/java/org/springblade/modules/information/entity/Information.java
@@ -144,6 +144,6 @@
private String representativecell;
private String contacts;
private String contactscell;
-
-
+ private String businessLicense;
+ private String licence;
}
diff --git a/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml b/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
index 221ab9c..d83c25c 100644
--- a/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
+++ b/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
@@ -26,6 +26,8 @@
<result column="representativecell" property="representativecell"/>
<result column="contacts" property="contacts"/>
<result column="contactscell" property="contactscell"/>
+ <result column="businessLicense" property="businessLicense"/>
+ <result column="licence" property="licence"/>
</resultMap>
@@ -861,7 +863,7 @@
FROM blade_user u
LEFT JOIN blade_dept d ON d.id = u.dept_id
LEFT JOIN sys_jurisdiction j ON j.id = u.jurisdiction
- WHERE u.examination_type = 1 and is_deleted=0
+ WHERE u.examination_type = 1 and u.is_deleted=0
<if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1123598813738675201'">
and u.jurisdiction =#{jurisdiction}
</if>
diff --git a/src/main/java/org/springblade/modules/jurisdiction/controller/JurisdictionController.java b/src/main/java/org/springblade/modules/jurisdiction/controller/JurisdictionController.java
index bd89591..2a8f292 100644
--- a/src/main/java/org/springblade/modules/jurisdiction/controller/JurisdictionController.java
+++ b/src/main/java/org/springblade/modules/jurisdiction/controller/JurisdictionController.java
@@ -130,7 +130,7 @@
/**
* 懒加载获取部门树形结构
*/
- @GetMapping("/lazy-trees")
+ @PostMapping("/lazy-trees")
@ApiOperation(value = "懒加载树形结构", notes = "树形结构")
public R<List<JurisdictionVO>> lazyTrees() {
List<JurisdictionVO> tree = jurisdictionService.lazyTrees();
--
Gitblit v1.9.3