反馈bug修改

controllers/activity.go

@@ -80,9 +80,9 @@ func (this *ActivityCoAntroller) ActivityList() {
 
 	keyWord := this.GetString("KeyWord")
 	activeState := this.GetString("ActiveState")
-	if activeState == "" {
-		activeState = "1"
-	}
+	//if activeState == "" {
+	//	activeState = "1"
+	//}
 	//if isShowJurisdiction != 1 {
 	//	isShowJurisdiction = 0
 	//}
@@ -133,15 +133,17 @@ func (this *ActivityCoAntroller) ActivityList() {
 		condition += ` AND art.activity_type_id  IN (` + activityTypeIds + `)`
 	}
 
-	condition += ` AND art.publish_status = 1 AND art.active_state  IN (` + activeState + `)`
-
+	condition += ` AND art.publish_status = 1 `
+	if activeState != "" {
+		condition += ` AND art.active_state  IN (` + activeState + `)`
+	}
 	total, err := models.GetActivityCount(condition, pars)
 	if err != nil {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取失败，Err:" + err.Error()
 		return
 	}
-	if activeState != "1" {
+	if activeState == "2" || activeState == "3" || activeState == "2,3" {
 		condition += ` ORDER BY art.activity_time DESC `
 	}
 	list, errList := models.GetActivityListAll(condition, pars, uid, startSize, pageSize)
@@ -252,7 +254,7 @@ func (this *ActivityCoAntroller) Detail() {
 	activityInfo, err := models.GetAddActivityInfoByIdShow(uid, activityId)
 	if activityInfo == nil {
 		br.Msg = "活动不存在"
-		br.ErrMsg = "活动ID错误，Err:" + err.Error() + "activityId：" + strconv.Itoa(activityId)
+		br.ErrMsg = "活动ID错误，Err:" + "activityId：" + strconv.Itoa(activityId)
 		return
 	}
 	detail, errDetail := models.GetActivityTypeDetailById(activityInfo.ActivityTypeId)
@@ -284,15 +286,30 @@ func (this *ActivityCoAntroller) Detail() {
 		permissionStr, err := models.GetCompanyPermission(user.CompanyId)
 		if err != nil {
 			br.Msg = "获取信息失败"
-			br.ErrMsg = "获取客户信息失败,Err:" + err.Error()
+			br.ErrMsg = "获取客户权限信息失败,Err:" + err.Error()
 			return
 		}
 		companyItem, err := models.GetCompanyDetailAllById(user.CompanyId)
 		if err != nil {
-			br.Msg = "获取信息失败"
-			br.ErrMsg = "获取客户信息失败,Err:" + err.Error()
-			return
+			if err.Error() == utils.ErrNoRow() {
+				resp.HasPermission = 4
+				br.Ret = 200
+				br.Success = true
+				br.Msg = "获取成功"
+				br.Data = resp
+				return
+			} else {
+				br.Msg = "获取信息失败"
+				br.ErrMsg = "获取客户公司信息失败,Err:" + err.Error()
+				return
+			}
 		}
+		//if errcompanyItem.Error() == utils.ErrNoRow() {
+		//	br.Msg = "获取信息失败"
+		//	br.ErrMsg = "判断是否已申请过试用失败，Err:" + errcompanyItem.Error()
+		//	return
+		//}
+
 		//1专家电话会、2分析师电话会、3公司调研电话会、4公司线下调研、5专家线下沙龙、6分析师线下沙龙
 		//OperationMode     string `description:"操作方式 Apply:立即申请、Call:拨号 为空则为有权限"`
 		if activityInfo.ActivityTypeId != 1 && activityInfo.ActivityTypeId != 4 && permissionStr == "专家" {