Merge branch 'ETA_2.3.0' into debug

controllers/data_manage/edb_classify.go

@@ -1264,12 +1264,12 @@ func (this *EdbInfoController) ClassifyEdbInfoList() {
 	var pars []interface{}
 
 	// 已授权分类id
-	permissionClassifyIdList, err := data_manage_permission.GetUserEdbClassifyPermissionList(this.SysUser.AdminId, 0)
-	if err != nil {
-		br.Msg = "获取失败"
-		br.ErrMsg = "获取已授权分类id数据失败，Err:" + err.Error()
-		return
-	}
+	//permissionClassifyIdList, err := data_manage_permission.GetUserEdbClassifyPermissionList(this.SysUser.AdminId, 0)
+	//if err != nil {
+	//	br.Msg = "获取失败"
+	//	br.ErrMsg = "获取已授权分类id数据失败，Err:" + err.Error()
+	//	return
+	//}
 	classifyIdsArr := make([]int, 0)
 	for _, v := range classifyIds {
 		if v != `` {
@@ -1278,9 +1278,9 @@ func (this *EdbInfoController) ClassifyEdbInfoList() {
 		}
 	}
 
-	if len(permissionClassifyIdList) > 0 {
-		classifyIdsArr = utils.IntersectInt(permissionClassifyIdList, classifyIdsArr)
-	}
+	//if len(permissionClassifyIdList) > 0 {
+	//	classifyIdsArr = utils.IntersectInt(permissionClassifyIdList, classifyIdsArr)
+	//}
 
 	condition += " AND edb_info_type = 0 "
 	if len(classifyIdsArr) > 0 {
@@ -1306,9 +1306,8 @@ func (this *EdbInfoController) ClassifyEdbInfoList() {
 			condition += " AND classify_id IN(" + utils.GetOrmInReplace(len(finalClassifyIds)) + ") "
 			pars = append(pars, finalClassifyIds)
 		}
-	} else {
-		condition += " AND 1=2 "
 	}
+
 	if keyWord != "" {
 		keyWordArr := strings.Split(keyWord, " ")
 		if len(keyWordArr) > 0 {