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/service/impl/MaintainServiceImpl.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/highdatas/mdm/service/impl/MaintainServiceImpl.java b/src/main/java/com/highdatas/mdm/service/impl/MaintainServiceImpl.java
index a1e8f76..63e27ea 100644
--- a/src/main/java/com/highdatas/mdm/service/impl/MaintainServiceImpl.java
+++ b/src/main/java/com/highdatas/mdm/service/impl/MaintainServiceImpl.java
@@ -9,6 +9,7 @@
import com.highdatas.mdm.entity.Flows;
import com.highdatas.mdm.entity.Maintain;
import com.highdatas.mdm.entity.MaintainDetail;
+import com.highdatas.mdm.entity.TUser;
import com.highdatas.mdm.mapper.MaintainMapper;
import com.highdatas.mdm.mapper.TableInfoMapper;
import com.highdatas.mdm.pojo.*;
@@ -107,7 +108,7 @@
maintain.deleteById();
return;
}
- String fields = masterDataService.getTempFields(tableName);
+ String fields = masterDataService.getTempFields(null, tableName);
String tempFields = masterDataService.getFields(tableName + Constant.RECORD);
String tableTempName = tableName + Constant.RECORD;
@@ -172,7 +173,7 @@
}
@Override
- public Result getUnSubmitData(String tableName, Integer pageNo, String pageSize, String whereSegment) {
+ public Result getUnSubmitData(TUser user, String tableName, Integer pageNo, String pageSize, String whereSegment) {
Wrapper<Maintain> versionWrapper = new EntityWrapper<Maintain>().eq("table_name", tableName).isNull("flow_id").orderBy("order_no desc");
Maintain maintain = selectOne(versionWrapper);
if (maintain == null) {
@@ -186,7 +187,7 @@
if (!StringUtils.isEmpty(pageSize)) {
page.setPageSize(Integer.valueOf(pageSize));
}
- String tempFields = masterDataService.getTempFields(tableName);
+ String tempFields = masterDataService.getTempFields(user, tableName);
List<Map<String, Object>> maps = maintainMapper.selectUnSubmitData(tempName, tempFields, whereSegment, DbUtils.quotedStr(maintainId), page.getLimitSQL());
JSONObject object = new JSONObject();
object.fluentPut("records", maps);
@@ -295,13 +296,13 @@
}
@Override
- public Result getInvalidVerionData(String tableName, String where, Integer pageNo, Integer pageSize) {
+ public Result getInvalidVerionData(TUser user, String tableName, String where, Integer pageNo, Integer pageSize) {
Maintain invalidVersion = getInvalidMaxVersion(tableName);
if (invalidVersion == null) {
return Result.success(null);
}
String tableTempName = tableName + Constant.RECORD;
- String tempFields = masterDataService.getTempFields(tableName);
+ String tempFields = masterDataService.getTempFields(user, tableName);
Long count = maintainMapper.countInvalidVersionData(tableTempName, where, invalidVersion.getOrderNo());
Page page = new Page(count);
page.setPageNo(pageNo);
@@ -448,7 +449,7 @@
}
@Override
- public Result tempDataByVersionByFlow(String flowId, String whereSegment, Integer pageNo, Integer pageSize) {
+ public Result tempDataByVersionByFlow(TUser user, String flowId, String whereSegment, Integer pageNo, Integer pageSize) {
Flows flows = flowsService.selectById(flowId);
if (flows == null) {
return Result.error(CodeMsg.SELECT_ERROR_NOTFOUND);
@@ -458,7 +459,7 @@
if (maintain == null) {
return Result.error(CodeMsg.SELECT_ERROR_NOTFOUND);
}
- String fields = masterDataService.getTempFields(maintain.getTableName());
+ String fields = masterDataService.getTempFields(user, maintain.getTableName());
String tableTempName = maintain.getTableName() + Constant.RECORD;
long total = maintainMapper.countTempDataByVersionByFlow(tableTempName, flowId, whereSegment);
--
Gitblit v1.8.0