xingzai 1 жил өмнө
parent
commit
227aabe4fe

+ 9 - 7
controllers/activity.go

@@ -2617,13 +2617,15 @@ func (this *ActivityCoAntroller) LabelTypeListV5() {
 			br.ErrMsg = "获取失败,Err:" + err.Error()
 			return
 		}
-		if leftPx > rightPx {
-			speciaItem.Position = 2
-		} else {
-			speciaItem.Position = 1
-		}
-		if len(speciaItem.List) > 0 {
-			itemsNew = append(itemsNew, speciaItem)
+		if speciaItem != nil {
+			if leftPx > rightPx {
+				speciaItem.Position = 2
+			} else {
+				speciaItem.Position = 1
+			}
+			if len(speciaItem.List) > 0 {
+				itemsNew = append(itemsNew, speciaItem)
+			}
 		}
 		//}
 	}

+ 1 - 1
services/admin.go

@@ -136,7 +136,7 @@ func GetSelleridWhichGroup(companyId, productId int, mobile string) (adminIds st
 		return
 	}
 
-	if mobile != "" {
+	if mobile != "" && adminIds != "" {
 		adminUser, e := models.GetSellerByAdminMobile(mobile)
 		if e != nil && e.Error() != utils.ErrNoRow() {
 			err = errors.New("GetSellerByAdminId, Err: " + e.Error())

+ 1 - 0
services/company_permission.go

@@ -190,6 +190,7 @@ func GetUserHasPermissionActivity(user *models.WxUserItem, activityInfo *models.
 					hasPermission = 3
 				}
 			}
+			err = nil
 			hasPermission = hasPermission
 			if strings.Contains(activityInfo.ChartPermissionName, utils.CHART_PERMISSION_NAME_YANXUAN) {
 				popupMsg = "暂无<b>买方研选</b>权限<br/>您可申请开通试用"