|
@@ -540,11 +540,23 @@ func (this *MobileReportController) List() {
|
|
// br.ErrMsg = "获取信息失败,Err:" + errCategory.Error() + "categoryID 不存在:" + strconv.Itoa(categoryId)
|
|
// br.ErrMsg = "获取信息失败,Err:" + errCategory.Error() + "categoryID 不存在:" + strconv.Itoa(categoryId)
|
|
// return
|
|
// return
|
|
//}
|
|
//}
|
|
|
|
+ //fmt.Println(detail.PolymerizationId)
|
|
if detail.PolymerizationId != "" {
|
|
if detail.PolymerizationId != "" {
|
|
condition = ` AND category_id IN(` + detail.PolymerizationId + `)`
|
|
condition = ` AND category_id IN(` + detail.PolymerizationId + `)`
|
|
} else {
|
|
} else {
|
|
|
|
+ categoryIdSet, errCategory := models.GetdetailByCategoryIdSet(categoryId)
|
|
|
|
+ if errCategory != nil {
|
|
|
|
+ br.Msg = "获取信息失败"
|
|
|
|
+ br.ErrMsg = "获取信息失败,Err:" + errCategory.Error() + "categoryID 不存在:" + strconv.Itoa(categoryId)
|
|
|
|
+ return
|
|
|
|
+ }
|
|
|
|
+ if categoryIdSet != "" {
|
|
|
|
+ condition = ` AND category_id IN(` + categoryIdSet + `)`
|
|
|
|
+ } else {
|
|
|
|
+ condition = ` AND category_id IN(` + strconv.Itoa(categoryId) + `)`
|
|
|
|
+ }
|
|
//condition = ` AND category_id IN(` + strconv.Itoa(categoryId) + `)`
|
|
//condition = ` AND category_id IN(` + strconv.Itoa(categoryId) + `)`
|
|
- condition = ` AND match_type_name = '` + detail.MatchTypeName + `'`
|
|
|
|
|
|
+ //condition = ` AND match_type_name = '` + detail.MatchTypeName + `'`
|
|
}
|
|
}
|
|
|
|
|
|
if industrialManagementId > 0 {
|
|
if industrialManagementId > 0 {
|
|
@@ -562,18 +574,6 @@ func (this *MobileReportController) List() {
|
|
pars = append(pars, articleIdList)
|
|
pars = append(pars, articleIdList)
|
|
}
|
|
}
|
|
|
|
|
|
- categoryIdSet, errCategory := models.GetdetailByCategoryIdSet(categoryId)
|
|
|
|
- if errCategory != nil {
|
|
|
|
- br.Msg = "获取信息失败"
|
|
|
|
- br.ErrMsg = "获取信息失败,Err:" + errCategory.Error() + "categoryID 不存在:" + strconv.Itoa(categoryId)
|
|
|
|
- return
|
|
|
|
- }
|
|
|
|
- if categoryIdSet != "" {
|
|
|
|
- condition = ` AND category_id IN(` + categoryIdSet + `)`
|
|
|
|
- } else {
|
|
|
|
- condition = ` AND category_id IN(` + strconv.Itoa(categoryId) + `)`
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
total, err = models.GetHomeCount(condition, pars)
|
|
total, err = models.GetHomeCount(condition, pars)
|
|
if err != nil {
|
|
if err != nil {
|
|
br.Msg = "获取信息失败"
|
|
br.Msg = "获取信息失败"
|