|
@@ -793,8 +793,8 @@ func DeductTripRemainingtimesByUser(user *cygx.UserAndCompanyName, activityInfo
|
|
|
condition = " AND company_id = ? ORDER BY points DESC LIMIT 1 "
|
|
|
pars = append(pars, companyId)
|
|
|
|
|
|
-
|
|
|
- if chartPermissionName != utils.CE_LUE_NAME {
|
|
|
+
|
|
|
+ if chartPermissionName != utils.CE_LUE_NAME && chartPermissionName != utils.GU_SHOU_NAME {
|
|
|
pars = make([]interface{}, 0)
|
|
|
condition = " AND company_id = ? AND (chart_permission_id = ? OR chart_permission_id = 0 ) ORDER BY points DESC LIMIT 1 "
|
|
|
pars = append(pars, companyId, activityInfo.ChartPermissionId)
|
|
@@ -882,8 +882,8 @@ func RebateTripRemainingtimesByUser(user *cygx.UserAndCompanyName, activityInfo
|
|
|
condition = " AND company_id = ? ORDER BY points DESC LIMIT 1 "
|
|
|
pars = append(pars, companyId)
|
|
|
|
|
|
-
|
|
|
- if chartPermissionName != utils.CE_LUE_NAME {
|
|
|
+
|
|
|
+ if chartPermissionName != utils.CE_LUE_NAME && chartPermissionName != utils.GU_SHOU_NAME {
|
|
|
pars = make([]interface{}, 0)
|
|
|
condition = " AND company_id = ? AND (chart_permission_id = ? OR chart_permission_id = 0 ) LIMIT 1 "
|
|
|
pars = append(pars, companyId, activityInfo.ChartPermissionId)
|