Merge branch 'cygx_need_967' of http://8.136.199.33:3000/hongze/hongze_cygx

controllers/home.go

@@ -10,7 +10,6 @@ import (
 	"html"
 	"strconv"
 	"strings"
-	"time"
 )
 
 type HomeController struct {
@@ -627,12 +626,12 @@ func (this *HomeController) NewList() {
 	var pars []interface{}
 	//var total int
 	resp := new(models.HomeResourceDataListResp)
-	totalRai, err := models.GetCountCompanyProductCompanyId(user.CompanyId, utils.COMPANY_PRODUCT_RAI_ID)
-	if err != nil && err.Error() != utils.ErrNoRow() {
-		br.Msg = "获取失败"
-		br.ErrMsg = "GetCountCompanyProductCompanyId，Err:" + err.Error()
-		return
-	}
+	//totalRai, err := models.GetCountCompanyProductCompanyId(user.CompanyId, utils.COMPANY_PRODUCT_RAI_ID)
+	//if err != nil && err.Error() != utils.ErrNoRow() {
+	//	br.Msg = "获取失败"
+	//	br.ErrMsg = "GetCountCompanyProductCompanyId，Err:" + err.Error()
+	//	return
+	//}
 
 	if tagIds != "" {
 		conditionTagIdsInit, err := services.GetConditionInitByTagIds(tagIds, chartPermissionId)
@@ -648,81 +647,81 @@ func (this *HomeController) NewList() {
 		conditionInit += " AND chart_permission_id  =  " + strconv.Itoa(chartPermissionId)
 	}
 
-	if tagIds == "" && chartPermissionId == 0 {
-		//查询近一个月的数据
-		conditionInit += " AND publish_date  >   '" + time.Now().AddDate(0, 0, -30).Format(utils.FormatDateTime) + "'"
-	}
+	//if tagIds == "" && chartPermissionId == 0 {
+	//	//查询近一个月的数据
+	//	conditionInit += " AND publish_date  >   '" + time.Now().AddDate(0, 0, -30).Format(utils.FormatDateTime) + "'"
+	//}
 
 	//conditionInit += `  AND source IN ('newchart')`
-	if user.CompanyId <= 1 || totalRai == 0 {
-		//condition += " AND source IN ('roadshow','article') "
-		condition += " AND source NOT IN ('activityspecial','industrialsourceHz','industrialsourceYx') "
-		listActivityYiDong, err := models.GetActivityListHomeNew("  AND art.yidong_activity_id != '' ", 0, 1000)
-		if err != nil {
-			br.Msg = "获取失败"
-			br.ErrMsg = "获取可见活动数据失败，Err:" + err.Error()
-			return
-		}
-		//易董的活动不查看  v12.2.1
-		var yiDongactivityIds []int
-		for _, v := range listActivityYiDong {
-			yiDongactivityIds = append(yiDongactivityIds, v.ActivityId)
-		}
-		lenyiDongactivityIds := len(yiDongactivityIds)
-		condition += `  AND IF ( source = 'activity' , source_id  NOT IN (` + utils.GetOrmInReplace(lenyiDongactivityIds) + `) ,1=1 ) `
-		pars = append(pars, yiDongactivityIds)
-	} else {
-		condition += ` AND source NOT IN ('activity','activityspecial','newchart','industrialsourceHz','industrialsourceYx') ` + conditionInit
-		//conditionActivity, err := services.GetActivityonditionList(user, "", "", "", "1,2,3", "", 0, 0, "", 0, 1)
-		conditionActivity, err := services.ActivityConditioninitSql(user, "", 0)
-		if err != nil && err.Error() != utils.ErrNoRow() {
-			br.Msg = "获取失败"
-			br.ErrMsg = "获取活动权限数据失败，Err:" + err.Error()
-			return
-		}
-		conditionActivity += ` AND art.publish_status = 1 `
-		var conditionOrder string
-		conditionOrder = ` ORDER BY art.activity_time DESC ,  art.active_state ASC   `
-		conditionActivity += conditionOrder
-		actPageSize := 200
-		if tagIds != "" {
-			actPageSize = 2000
-		}
-		listActivity, err := models.GetActivityListHomeNew(conditionActivity, 0, actPageSize)
-		if err != nil {
-			br.Msg = "获取失败"
-			br.ErrMsg = "获取可见活动数据失败，Err:" + err.Error()
-			return
-		}
+	//if user.CompanyId <= 1 || totalRai == 0 {
+	//	//condition += " AND source IN ('roadshow','article') "
+	//	condition += " AND source NOT IN ('activityspecial','industrialsourceHz','industrialsourceYx') "
+	//	listActivityYiDong, err := models.GetActivityListHomeNew("  AND art.yidong_activity_id != '' ", 0, 1000)
+	//	if err != nil {
+	//		br.Msg = "获取失败"
+	//		br.ErrMsg = "获取可见活动数据失败，Err:" + err.Error()
+	//		return
+	//	}
+	//	//易董的活动不查看  v12.2.1
+	//	var yiDongactivityIds []int
+	//	for _, v := range listActivityYiDong {
+	//		yiDongactivityIds = append(yiDongactivityIds, v.ActivityId)
+	//	}
+	//	lenyiDongactivityIds := len(yiDongactivityIds)
+	//	condition += `  AND IF ( source = 'activity' , source_id  NOT IN (` + utils.GetOrmInReplace(lenyiDongactivityIds) + `) ,1=1 ) `
+	//	pars = append(pars, yiDongactivityIds)
+	//} else {
+	condition += ` AND source NOT IN ('activity','activityspecial','newchart','industrialsourceHz','industrialsourceYx') ` + conditionInit
+	//conditionActivity, err := services.GetActivityonditionList(user, "", "", "", "1,2,3", "", 0, 0, "", 0, 1)
+	conditionActivity, err := services.ActivityConditioninitSql(user, "", 0)
+	if err != nil && err.Error() != utils.ErrNoRow() {
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取活动权限数据失败，Err:" + err.Error()
+		return
+	}
+	conditionActivity += ` AND art.publish_status = 1 `
+	var conditionOrder string
+	conditionOrder = ` ORDER BY art.activity_time DESC ,  art.active_state ASC   `
+	conditionActivity += conditionOrder
+	actPageSize := 200
+	if tagIds != "" {
+		actPageSize = 2000
+	}
+	listActivity, err := models.GetActivityListHomeNew(conditionActivity, 0, actPageSize)
+	if err != nil {
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取可见活动数据失败，Err:" + err.Error()
+		return
+	}
 
-		var activityIds []int
-		for _, v := range listActivity {
-			activityIds = append(activityIds, v.ActivityId)
-		}
-		lenActivityIds := len(activityIds)
+	var activityIds []int
+	for _, v := range listActivity {
+		activityIds = append(activityIds, v.ActivityId)
+	}
+	lenActivityIds := len(activityIds)
 
-		listActivitySpecial, _, err := services.GetActivitySpecialList(user, 1, 200, "")
-		if err != nil {
-			br.Msg = "获取失败"
-			br.ErrMsg = "获取专项调研可见权限失败失败，Err:" + err.Error()
-			return
-		}
+	listActivitySpecial, _, err := services.GetActivitySpecialList(user, 1, 200, "")
+	if err != nil {
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取专项调研可见权限失败失败，Err:" + err.Error()
+		return
+	}
 
-		var activityspecialIds []int
-		for _, v := range listActivitySpecial {
-			activityspecialIds = append(activityspecialIds, v.ActivityId)
-		}
-		lenActivityspecialIds := len(activityspecialIds)
+	var activityspecialIds []int
+	for _, v := range listActivitySpecial {
+		activityspecialIds = append(activityspecialIds, v.ActivityId)
+	}
+	lenActivityspecialIds := len(activityspecialIds)
 
-		if lenActivityIds > 0 {
-			condition += ` OR ( source = 'activity' AND source_id IN (` + utils.GetOrmInReplace(lenActivityIds) + `) ` + conditionInit + ` )    `
-			pars = append(pars, activityIds)
-		}
+	if lenActivityIds > 0 {
+		condition += ` OR ( source = 'activity' AND source_id IN (` + utils.GetOrmInReplace(lenActivityIds) + `) ` + conditionInit + ` )    `
+		pars = append(pars, activityIds)
+	}
 
-		if lenActivityspecialIds > 0 {
-			condition += ` OR ( source = 'activityspecial' AND source_id IN (` + utils.GetOrmInReplace(lenActivityspecialIds) + `) ` + conditionInit + ` )   `
-			pars = append(pars, activityspecialIds)
-		}
+	if lenActivityspecialIds > 0 {
+		condition += ` OR ( source = 'activityspecial' AND source_id IN (` + utils.GetOrmInReplace(lenActivityspecialIds) + `) ` + conditionInit + ` )   `
+		pars = append(pars, activityspecialIds)
+		//}
 	}
 	total, err := models.GetResourceDataCount(condition, pars)
 	if err != nil {

controllers/tag.go

@@ -31,20 +31,20 @@ func (this *TagController) TagCustomizeList() {
 
 	var condition string
 
-	hasPermission, err := services.GetUserHasPermissionSimple(sysUser)
-	if err != nil {
-		br.Msg = "获取信息失败"
-		br.ErrMsg = "判断是否已申请过试用失败，Err:" + err.Error()
-		return
-	}
-	if hasPermission > 1 {
-		list := make([]*models.CygxTagList, 0)
-		br.Ret = 200
-		br.Success = true
-		br.Msg = "获取成功"
-		br.Data = list
-		return
-	}
+	//hasPermission, err := services.GetUserHasPermissionSimple(sysUser)
+	//if err != nil {
+	//	br.Msg = "获取信息失败"
+	//	br.ErrMsg = "判断是否已申请过试用失败，Err:" + err.Error()
+	//	return
+	//}
+	//if hasPermission > 1 {
+	//	list := make([]*models.CygxTagList, 0)
+	//	br.Ret = 200
+	//	br.Success = true
+	//	br.Msg = "获取成功"
+	//	br.Data = list
+	//	return
+	//}
 
 	list, err := models.GetCygxTagList(condition)
 	for _, v := range list {

services/activity_special.go

@@ -655,6 +655,9 @@ func GetSpecialTripUserSchedule(userId int) (total int, err error) {
 
 // GetActivitySpecialList 获取专项调研列表
 func GetActivitySpecialList(user *models.WxUserItem, currentIndex, pageSize int, keywords string) (list []*models.CygxActivitySpecialDetail, total int, err error) {
+	if user.CompanyId < 1 {
+		return
+	}
 	listConfirm, totalConfirm, e := GetActivityLabelSpecialConfirmList(user, (currentIndex-1)*pageSize, pageSize, 4, keywords)
 	if e != nil && e.Error() != utils.ErrNoRow() {
 		err = errors.New("GetActivityLabelSpecialConfirmList11, Err: " + e.Error())