xingzai 2 éve
szülő
commit
d8bf62092a
1 módosított fájl, 6 hozzáadás és 1 törlés
  1. 6 1
      services/activity.go

+ 6 - 1
services/activity.go

@@ -221,7 +221,9 @@ func GetActivityonditionList(user *models.WxUserItem, activityTypeId, chartPermi
 	//} else {
 	//	condition += ` 	AND ( art.visible_range != 1  OR  (	 art.admin_id IN ( ` + adminIds + ` )  AND art.visible_range = 1 ))  `
 	//}
-	condition += ` 	AND ( art.visible_range != 1  OR  (	 art.admin_id IN ( ` + adminIds + ` )  AND art.visible_range = 1 ))  `
+	if adminIds != "" {
+		condition += ` 	AND ( art.visible_range != 1  OR  (	 art.admin_id IN ( ` + adminIds + ` )  AND art.visible_range = 1 ))  `
+	}
 	conditionHz = condition
 	//活动仅决策人可见
 	if isMaker == 0 {
@@ -806,6 +808,9 @@ func GetActivityDetailUserPower(user *models.WxUserItem, activityInfo *models.Ac
 		err = errors.New("GetCompanyPermissionUpgrade, Err: " + e.Error())
 		return
 	}
+	if permissionStr == "" {
+		return
+	}
 	if activityInfo.LimitPeopleNum > 0 {
 		mapUserType, e := GetActivityCcustomerTypeList()
 		if e != nil {