From 74472c9d22dddcb41383794caf0011043b20f817 Mon Sep 17 00:00:00 2001
From: kimi <kimi42345@gmail.com>
Date: 星期二, 31 三月 2020 13:25:47 +0800
Subject: [PATCH] fix 数据权限
---
src/main/java/com/highdatas/mdm/service/impl/MenuMappingServiceImpl.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 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 f5da1cd..6241cd5 100644
--- a/src/main/java/com/highdatas/mdm/service/impl/MenuMappingServiceImpl.java
+++ b/src/main/java/com/highdatas/mdm/service/impl/MenuMappingServiceImpl.java
@@ -1,6 +1,5 @@
package com.highdatas.mdm.service.impl;
-import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
@@ -191,7 +190,14 @@
Maintain resultMaintain = masterAuthorService.getMaxVersionMaintain(user.getUserId(), tableName);
+
if (resultMaintain != null) {
+ Maintain nowVersion = maintainService.getNowVersion(tableName);
+ if (nowVersion.getOrderNo().equals(resultMaintain.getOrderNo())) {
+ mapping.put("maintainType", 0);
+ }else {
+ mapping.put("maintainType", 1);
+ }
mapping.put("version", resultMaintain.getVersion());
mapping.put("maintainId", resultMaintain.getId());
}
--
Gitblit v1.8.0