From e64197421cf28099935f71f193989a3394d47fe0 Mon Sep 17 00:00:00 2001
From: mrzcc <121184950@qq.com>
Date: 星期一, 17 二月 2020 18:12:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 WebService/src/main/java/com/java110/web/smo/configMenu/impl/ConfigMenuBindingSMOImpl.java |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/WebService/src/main/java/com/java110/web/smo/configMenu/impl/ConfigMenuBindingSMOImpl.java b/WebService/src/main/java/com/java110/web/smo/configMenu/impl/ConfigMenuBindingSMOImpl.java
index 9cc1068..5c32cf8 100644
--- a/WebService/src/main/java/com/java110/web/smo/configMenu/impl/ConfigMenuBindingSMOImpl.java
+++ b/WebService/src/main/java/com/java110/web/smo/configMenu/impl/ConfigMenuBindingSMOImpl.java
@@ -2,12 +2,12 @@
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.java110.common.constant.PrivilegeCodeConstant;
-import com.java110.common.constant.ServiceCodeConfigMenuConstant;
-import com.java110.common.constant.ServiceConstant;
-import com.java110.common.util.Assert;
+import com.java110.utils.constant.PrivilegeCodeConstant;
+import com.java110.utils.constant.ServiceCodeConfigMenuConstant;
+import com.java110.utils.constant.ServiceConstant;
+import com.java110.utils.util.Assert;
 import com.java110.core.context.IPageData;
-import com.java110.web.core.AbstractComponentSMO;
+import com.java110.core.component.AbstractComponentSMO;
 import com.java110.web.smo.configMenu.IConfigMenuBindingSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpMethod;
@@ -39,6 +39,7 @@
         Assert.hasKeyByFlowData(infos, "addMenuView", "isShow", "蹇呭~锛岃閫夋嫨鏄惁鏄剧ず鑿滃崟");
         Assert.hasKeyByFlowData(infos, "addPrivilegeView", "name", "蹇呭~锛岃濉啓鏉冮檺鍚嶇О");
         Assert.hasKeyByFlowData(infos, "addPrivilegeView", "domain", "蹇呭~锛岃閫夋嫨鍟嗘埛绫诲瀷");
+        Assert.hasKeyByFlowData(infos, "addPrivilegeView", "resource", "蹇呭~锛岃娣诲姞璧勬簮璺緞");
 
 
         super.checkUserHasPrivilege(pd, restTemplate, PrivilegeCodeConstant.MENU_MANAGE);

--
Gitblit v1.8.0