From 0d831f835708bab1351fa26c7e8aea0a9bf8911e Mon Sep 17 00:00:00 2001
From: kimi <kimi42345@gmail.com>
Date: 星期三, 01 四月 2020 11:38:30 +0800
Subject: [PATCH] add usergroup 一半
---
src/main/java/com/highdatas/mdm/service/impl/MenuMappingServiceImpl.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/highdatas/mdm/service/impl/MenuMappingServiceImpl.java b/src/main/java/com/highdatas/mdm/service/impl/MenuMappingServiceImpl.java
index 6241cd5..a8890e3 100644
--- a/src/main/java/com/highdatas/mdm/service/impl/MenuMappingServiceImpl.java
+++ b/src/main/java/com/highdatas/mdm/service/impl/MenuMappingServiceImpl.java
@@ -189,10 +189,9 @@
TUser user = (TUser) session.getAttribute(Constant.USER);
Maintain resultMaintain = masterAuthorService.getMaxVersionMaintain(user.getUserId(), tableName);
-
+ Maintain nowVersion = maintainService.getNowVersion(tableName);
if (resultMaintain != null) {
- Maintain nowVersion = maintainService.getNowVersion(tableName);
if (nowVersion.getOrderNo().equals(resultMaintain.getOrderNo())) {
mapping.put("maintainType", 0);
}else {
@@ -201,6 +200,12 @@
mapping.put("version", resultMaintain.getVersion());
mapping.put("maintainId", resultMaintain.getId());
}
+
+ if (nowVersion != null) {
+ mapping.put("hasData", true);
+ }else {
+ mapping.put("hasData", false);
+ }
return Result.success(mapping);
}
--
Gitblit v1.8.0