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/controller/MasterDataController.java |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/highdatas/mdm/controller/MasterDataController.java b/src/main/java/com/highdatas/mdm/controller/MasterDataController.java
index 95491fb..a0e09ad 100644
--- a/src/main/java/com/highdatas/mdm/controller/MasterDataController.java
+++ b/src/main/java/com/highdatas/mdm/controller/MasterDataController.java
@@ -114,7 +114,10 @@
         }
         //ADD Filter
         String filter = masterAuthorService.getFilter(user.getUserId(), maintainFromVersion.getId());
-        whereSegment = DbUtils.StrJoin(whereSegment, Constant.AND, filter);
+        if (!StringUtils.isEmpty(filter)) {
+            whereSegment = DbUtils.StrJoin(whereSegment, Constant.AND, filter);
+        }
+
 
         if (StringUtils.isEmpty(fields)) {
             if (StringUtils.isEmpty(pageSizeStr)) {

--
Gitblit v1.8.0