|
|
@@ -771,7 +771,7 @@ func DeductTripRemainingtimesByUser(user *cygx.UserAndCompanyName, activityInfo
|
|
|
//判断是不是策略行业的活动，如果不是策略就获取对应行业的点数 ，策略的任何一个行业有剩余点数都能参加
|
|
|
if chartPermissionName != utils.CE_LUE_NAME {
|
|
|
pars = make([]interface{}, 0)
|
|
|
- condition = " AND company_id = ? AND chart_permission_id = ? AND points > 0 ORDER BY points DESC LIMIT 1 "
|
|
|
+ condition = " AND company_id = ? AND (chart_permission_id = ? OR chart_permission_id = 0 ) AND points > 0 ORDER BY points DESC LIMIT 1 "
|
|
|
pars = append(pars, companyId, activityInfo.ChartPermissionId)
|
|
|
}
|
|
|
activitySpecialPermissionPointsList, e := cygx.GetCygxActivitySpecialPermissionPointsList(condition, pars)
|
|
|
@@ -811,7 +811,7 @@ func RebateTripRemainingtimesByUser(user *cygx.UserAndCompanyName, activityInfo
|
|
|
//判断是不是策略行业的活动，如果不是策略就获取对应行业的点数 ，策略的任何一个行业有剩余点数都能参加
|
|
|
if chartPermissionName != utils.CE_LUE_NAME {
|
|
|
pars = make([]interface{}, 0)
|
|
|
- condition = " AND company_id = ? AND chart_permission_id = ? LIMIT 1 "
|
|
|
+ condition = " AND company_id = ? AND (chart_permission_id = ? OR chart_permission_id = 0 ) LIMIT 1 "
|
|
|
pars = append(pars, companyId, activityInfo.ChartPermissionId)
|
|
|
} else {
|
|
|
lastTripBill, e := cygx.GetCygxActivitySpecialTripBillLastDetialByActivityId(activityInfo.ActivityId, user.UserId)
|
|
|
@@ -821,7 +821,7 @@ func RebateTripRemainingtimesByUser(user *cygx.UserAndCompanyName, activityInfo
|
|
|
}
|
|
|
|
|
|
pars = make([]interface{}, 0)
|
|
|
- condition = " AND company_id = ? AND chart_permission_id = ? LIMIT 1 "
|
|
|
+ condition = " AND company_id = ? AND (chart_permission_id = ? OR chart_permission_id = 0 ) LIMIT 1 "
|
|
|
pars = append(pars, companyId, lastTripBill.ChartPermissionId)
|
|
|
}
|
|
|
activitySpecialPermissionPointsList, e := cygx.GetCygxActivitySpecialPermissionPointsList(condition, pars)
|
xingzai