From b2b6075d6588a5fbecd091cbe47494081eba9b9c Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 01 二月 2023 19:02:07 +0800
Subject: [PATCH] 1

---
 src/main/java/com/lf/server/controller/all/BaseQueryController.java |   34 ++++++++++++++++++++++------------
 1 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/lf/server/controller/all/BaseQueryController.java b/src/main/java/com/lf/server/controller/all/BaseQueryController.java
index 73025d7..f09cce4 100644
--- a/src/main/java/com/lf/server/controller/all/BaseQueryController.java
+++ b/src/main/java/com/lf/server/controller/all/BaseQueryController.java
@@ -8,9 +8,9 @@
 import com.lf.server.entity.all.ResponseMsg;
 import com.lf.server.entity.ctrl.DownloadReqEntity;
 import com.lf.server.entity.ctrl.IdNameEntity;
+import com.lf.server.entity.ctrl.KeyValueEntity;
 import com.lf.server.entity.ctrl.TabEntity;
 import com.lf.server.entity.data.DictEntity;
-import com.lf.server.entity.data.DirEntity;
 import com.lf.server.entity.data.DomainEntity;
 import com.lf.server.entity.data.DownloadEntity;
 import com.lf.server.entity.sys.AttachEntity;
@@ -55,9 +55,6 @@
 
     @Autowired
     BaseQueryService baseQueryService;
-
-    @Autowired
-    UploadService uploadService;
 
     @SysLog()
     @ApiOperation(value = "鏌ヨ璁板綍鏁�")
@@ -466,11 +463,11 @@
     }
 
     @SysLog()
-    @ApiOperation(value = "鏌ヨ椤圭洰鍚嶇О")
-    @GetMapping(value = "/selectProject")
-    public ResponseMsg<Object> selectProject() {
+    @ApiOperation(value = "鏌ヨ鍩虹鍦扮悊绫诲埆")
+    @GetMapping(value = "/selectBaseType")
+    public ResponseMsg<Object> selectBaseType() {
         try {
-            List<DirEntity> list = uploadService.selectProject();
+            List<KeyValueEntity> list = baseQueryService.selectBaseType();
 
             return success(list);
         } catch (Exception ex) {
@@ -479,11 +476,24 @@
     }
 
     @SysLog()
-    @ApiOperation(value = "鏌ヨ鍩虹鍦扮悊绫诲埆")
-    @GetMapping(value = "/selectBaseType")
-    public ResponseMsg<Object> selectBaseType() {
+    @ApiOperation(value = "鏌ヨ涓氬姟绫诲埆")
+    @GetMapping(value = "/selectBusinessType")
+    public ResponseMsg<Object> selectBusinessType() {
         try {
-            List<DirEntity> list = baseQueryService.selectBaseType();
+            List<KeyValueEntity> list = baseQueryService.selectBusinessType();
+
+            return success(list);
+        } catch (Exception ex) {
+            return fail(ex.getMessage(), null);
+        }
+    }
+
+    @SysLog()
+    @ApiOperation(value = "鏌ヨ椤圭洰鍚嶇О")
+    @GetMapping(value = "/selectProject")
+    public ResponseMsg<Object> selectProject() {
+        try {
+            List<KeyValueEntity> list = baseQueryService.selectProject();
 
             return success(list);
         } catch (Exception ex) {

--
Gitblit v1.9.3