|
@@ -347,22 +347,20 @@ func (this *SciHqDataController) BatchIndexList() {
|
|
|
return
|
|
|
}
|
|
|
if req.ClassifyId > 0 {
|
|
|
- var classifyIds []int
|
|
|
- tmpClassifyIds, err := data_manage.GetSciHqChildClassifyIdsById(req.ClassifyId)
|
|
|
+ childClassify, err := data_manage.GetChildSciHqClassifyListById(req.ClassifyId)
|
|
|
if err != nil {
|
|
|
- br.Msg = "获取失败"
|
|
|
- br.ErrMsg = "获取分类信息失败,Err:" + err.Error()
|
|
|
+ br.Msg = "下载失败"
|
|
|
+ br.ErrMsg = "获取分类失败,Err:" + err.Error()
|
|
|
return
|
|
|
}
|
|
|
- if len(tmpClassifyIds) > 0 {
|
|
|
- classifyIds = append(classifyIds, tmpClassifyIds...)
|
|
|
- }
|
|
|
- if len(classifyIds) > 0 {
|
|
|
- condition += ` AND classify_id IN (` + utils.GetOrmInReplace(len(classifyIds)) + `)`
|
|
|
- pars = append(pars, classifyIds)
|
|
|
+ if len(childClassify) > 0 {
|
|
|
+ condition += `AND classify_id IN (` + utils.GetOrmInReplace(len(childClassify)) + `)`
|
|
|
+ for _, child := range childClassify {
|
|
|
+ pars = append(pars, child.ClassifyId)
|
|
|
+ }
|
|
|
} else {
|
|
|
- br.Msg = "请选择正确的分类"
|
|
|
- return
|
|
|
+ condition += ` AND classify_id=?`
|
|
|
+ pars = append(pars, req.ClassifyId)
|
|
|
}
|
|
|
} else {
|
|
|
condition += ` AND classify_id=?`
|