zhangchuanxing 3 hari lalu
induk
melakukan
ff2b24caa1
1 mengubah file dengan 6 tambahan dan 7 penghapusan
  1. 6 7
      services/roadshow/calendar.go

+ 6 - 7
services/roadshow/calendar.go

@@ -1108,6 +1108,11 @@ func CheckAddRoadShowCompanyPoint(companyId int, researcherList []*roadshow.Cale
 			go alarm_msg.SendAlarmMsg("获取公司剩余点数失败:"+err.Error(), 2)
 		}
 	}()
+	pointsCompany, e := cygx.GetCygxActivitySpecialPermissionPointsCount(companyId)
+	if e != nil && e.Error() != utils.ErrNoRow() {
+		err = errors.New("GetCygxActivitySpecialPermissionPointsCount, Err: " + e.Error())
+		return
+	}
 	productItemRai, e := company.GetCompanyProductByCompanyIdAndProductId(companyId, utils.COMPANY_PRODUCT_RAI_ID)
 	if e != nil {
 		err = errors.New("GetCompanyProductByCompanyIdAndProductId, Err: " + e.Error())
@@ -1135,19 +1140,13 @@ func CheckAddRoadShowCompanyPoint(companyId int, researcherList []*roadshow.Cale
 			if v.Name == "王芳" { // 王芳,不需要判断权限和点数
 				continue
 			}
-			if !strings.Contains(permissionStr, v.ChartPermissionName) {
+			if !strings.Contains(permissionStr, v.ChartPermissionName) && pointsCompany <= 0 {
 				addType = 3
 				return
 			}
 		}
 	}
 
-	pointsCompany, e := cygx.GetCygxActivitySpecialPermissionPointsCount(companyId)
-	if e != nil && e.Error() != utils.ErrNoRow() {
-		err = errors.New("GetCygxActivitySpecialPermissionPointsCount, Err: " + e.Error())
-		return
-	}
-
 	if pointsCompany > 0 || productItemRai.Status == utils.COMPANY_STATUS_FORMAL {
 		points = len(researcherList)
 	} else {