From 57c62dd3e7d398e253c2db549b819d020040b1a5 Mon Sep 17 00:00:00 2001
From: kimi42345 <kimi42345@outlook.com>
Date: 星期日, 29 三月 2020 20:49:17 +0800
Subject: [PATCH] no message
---
src/main/java/com/highdatas/mdm/controller/MaintainController.java | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/highdatas/mdm/controller/MaintainController.java b/src/main/java/com/highdatas/mdm/controller/MaintainController.java
index 0c3ba44..662d38c 100644
--- a/src/main/java/com/highdatas/mdm/controller/MaintainController.java
+++ b/src/main/java/com/highdatas/mdm/controller/MaintainController.java
@@ -15,6 +15,7 @@
import com.highdatas.mdm.pojo.Result;
import com.highdatas.mdm.service.*;
import com.highdatas.mdm.util.Constant;
+import com.highdatas.mdm.util.DbUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -63,19 +64,20 @@
public Result unSubmit(@PathVariable String tableName, @PathVariable Integer pageNo, HttpServletRequest request) throws UnsupportedEncodingException {
String pageSize = request.getParameter("pageSize");
String whereSegment = request.getParameter("whereSegment");
-
+ TUser user = DbUtils.getUser(request);
if (StringUtils.isEmpty(whereSegment)) {
whereSegment = Constant.WHERE_DEFAULT;
}else {
whereSegment = URLDecoder.decode(whereSegment, "UTF-8");
}
- return maintainService.getUnSubmitData(tableName, pageNo, pageSize, whereSegment);
+ return maintainService.getUnSubmitData(user, tableName, pageNo, pageSize, whereSegment);
}
@RequestMapping(value = "{tableName}/unflow/{pageNo}", method = RequestMethod.GET)
public Result unflow(@PathVariable String tableName, @PathVariable Integer pageNo, HttpServletRequest request) throws UnsupportedEncodingException {
String pageSize = request.getParameter("pageSize");
String whereSegment = request.getParameter("whereSegment");
+ TUser user = DbUtils.getUser(request);
if (StringUtils.isEmpty(whereSegment)) {
whereSegment = Constant.WHERE_DEFAULT;
@@ -83,9 +85,9 @@
whereSegment = URLDecoder.decode(whereSegment, "UTF-8");
}
if (StringUtils.isEmpty(pageSize)) {
- return maintainService.getInvalidVerionData(tableName, whereSegment, pageNo, null);
+ return maintainService.getInvalidVerionData(user, tableName, whereSegment, pageNo, null);
} else {
- return maintainService.getInvalidVerionData(tableName, whereSegment, pageNo, Integer.valueOf(pageSize));
+ return maintainService.getInvalidVerionData(user, tableName, whereSegment, pageNo, Integer.valueOf(pageSize));
}
}
@@ -225,13 +227,14 @@
public Result setFlowId(@RequestParam String flowId,@PathVariable Integer pageNo, HttpServletRequest request) {
String whereSegment = request.getParameter("whereSegment");
String pageSize = request.getParameter("pageSize");
+ TUser user = DbUtils.getUser(request);
if (StringUtils.isEmpty(whereSegment)) {
whereSegment = Constant.WHERE_DEFAULT;
}
if (StringUtils.isEmpty(pageSize)) {
- return maintainService.tempDataByVersionByFlow(flowId, whereSegment, pageNo, null);
+ return maintainService.tempDataByVersionByFlow(user, flowId, whereSegment, pageNo, null);
}
- return maintainService.tempDataByVersionByFlow(flowId, whereSegment, pageNo, Integer.valueOf(pageSize));
+ return maintainService.tempDataByVersionByFlow(user, flowId, whereSegment, pageNo, Integer.valueOf(pageSize));
}
--
Gitblit v1.8.0