From 5d15287b2a06f978485ac6af71e33e1a82b43a65 Mon Sep 17 00:00:00 2001
From: kimi <kimi42345@gmail.com>
Date: 星期三, 15 四月 2020 16:29:55 +0800
Subject: [PATCH] fix 上传后生成版本连接池用完不释放问题
---
src/main/java/com/highdatas/mdm/controller/SysFieldController.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/highdatas/mdm/controller/SysFieldController.java b/src/main/java/com/highdatas/mdm/controller/SysFieldController.java
index b89ebd3..dea9884 100644
--- a/src/main/java/com/highdatas/mdm/controller/SysFieldController.java
+++ b/src/main/java/com/highdatas/mdm/controller/SysFieldController.java
@@ -6,6 +6,7 @@
import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.highdatas.mdm.entity.*;
+import com.highdatas.mdm.entity.Character;
import com.highdatas.mdm.mapper.SysFieldMapper;
import com.highdatas.mdm.pojo.ActivitiStatus;
import com.highdatas.mdm.pojo.CodeMsg;
@@ -56,13 +57,13 @@
@RequestMapping(value = "/{tableName}", method = RequestMethod.GET)
public Result getFields(@PathVariable String tableName, HttpServletRequest request){
- TUser user = DbUtils.getUser(request);
+ Character character = DbUtils.getCharacter(request);
String maintainId = request.getParameter("maintainId");
if (StringUtils.isEmpty(maintainId)) {
List<SysField> fieldList = fieldService.getFieldByTable(tableName);
return Result.success(fieldList);
}else {
- List<SysField> field = masterAuthorService.getField(user.getUserId(), maintainId);
+ List<SysField> field = masterAuthorService.getField(character, maintainId);
//List<SysField> fieldList = fieldService.getFieldByMaintain(maintainId);
return Result.success(field);
@@ -82,7 +83,7 @@
return Result.error(CodeMsg.ERROR_PARAMS_NOT_MATHED);
}
TUser user = DbUtils.getUser(request);
- List<SysField> field = masterAuthorService.getField(user.getUserId(), maintainId);
+ List<SysField> field = masterAuthorService.getField(user, maintainId);
Integer size;
if(StringUtils.isEmpty(pageSize)){
size = 15;
--
Gitblit v1.8.0