fix

controllers/data_manage/edb_classify.go

@@ -1281,7 +1281,7 @@ func (this *EdbInfoController) ClassifyEdbInfoList() {
 			condition += " AND classify_id IN(" + utils.GetOrmInReplace(len(classifyIdsArr)) + ") "
 			pars = append(pars, classifyIdsArr)
 		} else {
-			classifyAll, err := data_manage.GetEdbClassifyAll()
+			classifyAll, err := data_manage.GetNormalEdbClassifyAll()
 			if err != nil && err.Error() != utils.ErrNoRow() {
 				br.Msg = "获取失败"
 				br.ErrMsg = "获取数据失败，Err:" + err.Error()
@@ -1326,6 +1326,23 @@ func (this *EdbInfoController) ClassifyEdbInfoList() {
 		pars = append(pars, adminIdsSlice)
 	}
 
+	// 获取当前账号的不可见指标
+	obj := data_manage.EdbInfoNoPermissionAdmin{}
+	confList, err := obj.GetAllListByAdminId(this.SysUser.AdminId)
+	if err != nil && err.Error() != utils.ErrNoRow() {
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取不可见指标配置数据失败，Err:" + err.Error()
+		return
+	}
+	noPermissionEdbInfoIds := make([]int, 0)
+	for _, v := range confList {
+		noPermissionEdbInfoIds = append(noPermissionEdbInfoIds, v.EdbInfoId)
+	}
+	if len(noPermissionEdbInfoIds) > 0 {
+		condition += " AND edb_info_id NOT IN(" + utils.GetOrmInReplace(len(noPermissionEdbInfoIds)) + ") "
+		pars = append(pars, noPermissionEdbInfoIds)
+	}
+
 	count, err := data_manage.GetEdbInfoByConditionCount(condition, pars)
 	if err != nil && err.Error() != utils.ErrNoRow() {
 		br.Msg = "获取失败"

controllers/data_manage/edb_info.go

@@ -6757,7 +6757,7 @@ func (this *EdbInfoController) ModifyEdbList() {
 				condition += " AND classify_id IN(" + utils.GetOrmInReplace(len(classifyIdsArr)) + ") "
 				pars = append(pars, classifyIdsArr)
 			} else {
-				classifyAll, err := data_manage.GetEdbClassifyAll()
+				classifyAll, err := data_manage.GetNormalEdbClassifyAll()
 				if err != nil && err.Error() != utils.ErrNoRow() {
 					br.Msg = "获取失败"
 					br.ErrMsg = "获取数据失败，Err:" + err.Error()
@@ -6801,6 +6801,22 @@ func (this *EdbInfoController) ModifyEdbList() {
 			condition += "  AND sys_user_id in (" + utils.GetOrmInReplace(len(adminIds)) + ") "
 			pars = append(pars, adminIdsSlice)
 		}
+		// 获取当前账号的不可见指标
+		obj := data_manage.EdbInfoNoPermissionAdmin{}
+		confList, err := obj.GetAllListByAdminId(this.SysUser.AdminId)
+		if err != nil && err.Error() != utils.ErrNoRow() {
+			br.Msg = "获取失败"
+			br.ErrMsg = "获取不可见指标配置数据失败，Err:" + err.Error()
+			return
+		}
+		noPermissionEdbInfoIds := make([]int, 0)
+		for _, v := range confList {
+			noPermissionEdbInfoIds = append(noPermissionEdbInfoIds, v.EdbInfoId)
+		}
+		if len(noPermissionEdbInfoIds) > 0 {
+			condition += " AND edb_info_id NOT IN(" + utils.GetOrmInReplace(len(noPermissionEdbInfoIds)) + ") "
+			pars = append(pars, noPermissionEdbInfoIds)
+		}
 
 		count, err := data_manage.GetEdbInfoByConditionCount(condition, pars)
 		if err != nil && err.Error() != utils.ErrNoRow() {