From 32603deb6f5cae2d115102bd9e4969edffa1cc2f Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Wed, 14 Jul 2021 16:17:22 +0800
Subject: [PATCH] 1.附件上传
---
src/main/java/org/springblade/common/config/BladeConfiguration.java | 1 +
src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml | 6 +++---
src/main/java/org/springblade/modules/system/controller/DeptController.java | 5 ++++-
src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java | 5 +++++
src/main/java/org/springblade/modules/permit/controller/PermitController.java | 2 +-
src/main/java/org/springblade/modules/system/service/IDeptService.java | 1 +
6 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/springblade/common/config/BladeConfiguration.java b/src/main/java/org/springblade/common/config/BladeConfiguration.java
index cfc384a..bb59834 100644
--- a/src/main/java/org/springblade/common/config/BladeConfiguration.java
+++ b/src/main/java/org/springblade/common/config/BladeConfiguration.java
@@ -64,6 +64,7 @@
secureRegistry.excludePathPatterns("/experience/**");
secureRegistry.excludePathPatterns("/jurisdiction/**");
secureRegistry.excludePathPatterns("/permit/**");
+ secureRegistry.excludePathPatterns("/blade-resource/oss/endpoint/put-file-attach/**");
return secureRegistry;
}
diff --git a/src/main/java/org/springblade/modules/permit/controller/PermitController.java b/src/main/java/org/springblade/modules/permit/controller/PermitController.java
index 92e82d6..cb7cae7 100644
--- a/src/main/java/org/springblade/modules/permit/controller/PermitController.java
+++ b/src/main/java/org/springblade/modules/permit/controller/PermitController.java
@@ -43,7 +43,7 @@
*/
@RestController
@AllArgsConstructor
-@RequestMapping("blade-permit/permit")
+@RequestMapping("/permit")
@Api(value = "", tags = "接口")
public class PermitController extends BladeController {
diff --git a/src/main/java/org/springblade/modules/system/controller/DeptController.java b/src/main/java/org/springblade/modules/system/controller/DeptController.java
index 1026e5a..707d433 100644
--- a/src/main/java/org/springblade/modules/system/controller/DeptController.java
+++ b/src/main/java/org/springblade/modules/system/controller/DeptController.java
@@ -163,6 +163,9 @@
CacheUtil.clear(SYS_CACHE);
return R.status(deptService.removeDept(ids));
}
-
+ @GetMapping("/selectIn")
+ public R selectIn() {
+ return R.data(deptService.selectIn());
+ }
}
diff --git a/src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml b/src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml
index 8cfbd38..96c87d7 100644
--- a/src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml
@@ -145,10 +145,10 @@
<select id="selectIn" resultType="java.util.HashMap">
SELECT
- id,
- dept_name
+ id as deptid,
+ dept_name as deptname
FROM
- blade_dept
+ blade_dept where is_deleted = 0
</select>
<!--统计单位类型数量-->
diff --git a/src/main/java/org/springblade/modules/system/service/IDeptService.java b/src/main/java/org/springblade/modules/system/service/IDeptService.java
index 6886622..3f92c09 100644
--- a/src/main/java/org/springblade/modules/system/service/IDeptService.java
+++ b/src/main/java/org/springblade/modules/system/service/IDeptService.java
@@ -125,4 +125,5 @@
List<Map<Object,String>> selectCount(String name);
List<Map<Object,String>> selectId(String id);
Map<Object,Integer> selectHold(String deptid);
+ List<String> selectIn();
}
diff --git a/src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java b/src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java
index ffa2c45..04a9018 100644
--- a/src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java
+++ b/src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java
@@ -184,4 +184,9 @@
return baseMapper.selectHold(deptid);
}
+ @Override
+ public List<String> selectIn() {
+ return baseMapper.selectIn();
+ }
+
}
--
Gitblit v1.9.3