|
@@ -1256,12 +1256,12 @@ func (this *EdbInfoController) ClassifyEdbInfoList() {
|
|
var pars []interface{}
|
|
var pars []interface{}
|
|
|
|
|
|
// 已授权分类id
|
|
// 已授权分类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)
|
|
classifyIdsArr := make([]int, 0)
|
|
for _, v := range classifyIds {
|
|
for _, v := range classifyIds {
|
|
if v != `` {
|
|
if v != `` {
|
|
@@ -1270,9 +1270,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 "
|
|
condition += " AND edb_info_type = 0 "
|
|
if len(classifyIdsArr) > 0 {
|
|
if len(classifyIdsArr) > 0 {
|
|
@@ -1298,9 +1298,8 @@ func (this *EdbInfoController) ClassifyEdbInfoList() {
|
|
condition += " AND classify_id IN(" + utils.GetOrmInReplace(len(finalClassifyIds)) + ") "
|
|
condition += " AND classify_id IN(" + utils.GetOrmInReplace(len(finalClassifyIds)) + ") "
|
|
pars = append(pars, finalClassifyIds)
|
|
pars = append(pars, finalClassifyIds)
|
|
}
|
|
}
|
|
- } else {
|
|
|
|
- condition += " AND 1=2 "
|
|
|
|
}
|
|
}
|
|
|
|
+
|
|
if keyWord != "" {
|
|
if keyWord != "" {
|
|
keyWordArr := strings.Split(keyWord, " ")
|
|
keyWordArr := strings.Split(keyWord, " ")
|
|
if len(keyWordArr) > 0 {
|
|
if len(keyWordArr) > 0 {
|