|
@@ -215,6 +215,7 @@ func (this *EdbInfoController) WindEdbInfoList() {
|
|
|
|
|
|
// 分类筛选
|
|
|
classifyId, _ := this.GetInt("ClassifyId")
|
|
|
+ edbInfoId, _ := this.GetInt("EdbInfoId")
|
|
|
if classifyId > 0 {
|
|
|
childClassify, e, _ := data.GetChildClassifyByClassifyId(classifyId)
|
|
|
if e != nil && e.Error() != utils.ErrNoRow() {
|
|
@@ -229,6 +230,10 @@ func (this *EdbInfoController) WindEdbInfoList() {
|
|
|
condition += fmt.Sprintf(` AND classify_id IN (%s) `, utils.GetOrmInReplace(len(classifyIds)))
|
|
|
pars = append(pars, classifyIds)
|
|
|
}
|
|
|
+ if edbInfoId > 0 {
|
|
|
+ condition += ` AND edb_info_id = ?`
|
|
|
+ pars = append(pars, edbInfoId)
|
|
|
+ }
|
|
|
|
|
|
// 获取当前账号的不可见指标
|
|
|
obj := data_manage.EdbInfoNoPermissionAdmin{}
|
|
@@ -259,6 +264,9 @@ func (this *EdbInfoController) WindEdbInfoList() {
|
|
|
if len(edbList) > 0 {
|
|
|
classifyMap := make(map[int]*data_manage.EdbClassify)
|
|
|
targetClassifyList := make([]*data_manage.EdbClassifyItems, 0)
|
|
|
+ if edbInfoId > 0 && classifyId == 0 {
|
|
|
+ classifyId = edbList[0].ClassifyId
|
|
|
+ }
|
|
|
if classifyId > 0 { // todo 当没有传入分类ID时,如何处理 同一个分类ID,顶级分类是一样的
|
|
|
targetClassify, err := data_manage.GetEdbClassifyById(classifyId)
|
|
|
if err != nil {
|