Merge branch 'master' of 192.168.30.132:MTP2.0/MTP20_IF

controllers/common/menu.go

@@ -287,10 +287,7 @@ func createPCWebMenu(datas []interface{}, loginID int) []PCWebMenu {
 		if data["isshow"].(bool) {
 			// 判断权限
 			rulekey := data["rulekey"].(string)
-			// FIXME: - 暂时代码
-			requireAuth := false // rulekey != ""
-			// FIXME: - 暂时代码
-			requireAuth = false
+			requireAuth := rulekey != ""
 			if requireAuth {
 				// 判断是否有权限
 				funcMenuList, err := models.GetErmcpRoleFuncMenuLists(loginID, rulekey)
@@ -311,8 +308,7 @@ func createPCWebMenu(datas []interface{}, loginID int) []PCWebMenu {
 					if am["isshow"].(bool) {
 						// 判断权限
 						rulekey := am["rulekey"].(string)
-						// FIXME: - 暂时代码
-						requireAuth := false // rulekey != ""
+						requireAuth := rulekey != ""
 						if requireAuth {
 							// 判断是否有权限
 							funcMenuList, err := models.GetErmcpRoleFuncMenuLists(loginID, rulekey)