From 97c74c4cabbf10a70ae7f772ffeda08cdecd7ae0 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 02 十一月 2022 19:58:18 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/controller/all/BaseQueryController.java | 30 ++++++++++++++++++++++++++----
1 files changed, 26 insertions(+), 4 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 31b9c7b..79a465b 100644
--- a/src/main/java/com/lf/server/controller/all/BaseQueryController.java
+++ b/src/main/java/com/lf/server/controller/all/BaseQueryController.java
@@ -204,12 +204,23 @@
@SysLog()
@ApiOperation(value = "鏌ヨ瀛楁淇℃伅")
@ApiImplicitParams({
- @ApiImplicitParam(name = "name", value = "鏄犲皠鍚嶇О", dataType = "String", paramType = "query", example = "dlgAgnp")
+ @ApiImplicitParam(name = "name", value = "鏄犲皠鍚嶇О", dataType = "String", paramType = "query", example = "dlg25wAanp")
})
@GetMapping(value = "/selectFields")
public ResponseMsg<List<DictEntity>> selectFields(String name) {
try {
- List<DictEntity> list = baseQueryService.selectFields(name);
+ BasicMapper baseMapper = baseQueryService.getBasicMapper(name);
+ if (baseMapper == null) {
+ return fail("鏌ヨ瀵硅薄涓嶅瓨鍦�", null);
+ }
+
+ String tabName = baseQueryService.getTabName(baseMapper);
+ if (tabName == null) {
+ return null;
+ }
+
+ String[] strs = tabName.split("\\.");
+ List<DictEntity> list = baseQueryService.selectFields(strs[0], strs[1]);
return success(list);
} catch (Exception ex) {
@@ -220,12 +231,23 @@
@SysLog()
@ApiOperation(value = "鏌ヨ鍊煎煙淇℃伅")
@ApiImplicitParams({
- @ApiImplicitParam(name = "name", value = "鏄犲皠鍚嶇О", dataType = "String", paramType = "query", example = "dlgAgnp")
+ @ApiImplicitParam(name = "name", value = "鏄犲皠鍚嶇О", dataType = "String", paramType = "query", example = "dlg25wAanp")
})
@GetMapping(value = "/selectDomains")
public ResponseMsg<List<DomainEntity>> selectDomains(String name) {
try {
- List<DomainEntity> list = baseQueryService.selectDomains(name);
+ BasicMapper baseMapper = baseQueryService.getBasicMapper(name);
+ if (baseMapper == null) {
+ return fail("鏌ヨ瀵硅薄涓嶅瓨鍦�", null);
+ }
+
+ String tabName = baseQueryService.getTabName(baseMapper);
+ if (tabName == null) {
+ return null;
+ }
+
+ String[] strs = tabName.split("\\.");
+ List<DomainEntity> list = baseQueryService.selectDomains(strs[0], strs[1]);
return success(list);
} catch (Exception ex) {
--
Gitblit v1.9.3