|
@@ -1126,6 +1126,7 @@ func CheckAddRoadShowCompanyPoint(companyId int, researcherList []*roadshow.Cale
|
|
|
}
|
|
|
|
|
|
//用户没有路演服务,以及研究员所关联行业的权限,就进行报错提示
|
|
|
+ var isHaveWangFang bool // 研究员里面是否包含王芳
|
|
|
if !strings.Contains(permissionStr, utils.LU_YAN_FU_WU) {
|
|
|
var adminIds []string
|
|
|
for _, v := range researcherList {
|
|
@@ -1137,7 +1138,8 @@ func CheckAddRoadShowCompanyPoint(companyId int, researcherList []*roadshow.Cale
|
|
|
return
|
|
|
}
|
|
|
for _, v := range askEmailList {
|
|
|
- if v.Name == "王芳" { // 王芳,不需要判断权限和点数
|
|
|
+ if v.Name == "王芳" { // 王芳,不需要判断权限和点数,以及对应的点数弹窗提示
|
|
|
+ isHaveWangFang = true
|
|
|
continue
|
|
|
}
|
|
|
if !strings.Contains(permissionStr, v.ChartPermissionName) {
|
|
@@ -1149,6 +1151,9 @@ func CheckAddRoadShowCompanyPoint(companyId int, researcherList []*roadshow.Cale
|
|
|
|
|
|
if pointsCompany > 0 || productItemRai.Status == utils.COMPANY_STATUS_FORMAL {
|
|
|
points = len(researcherList)
|
|
|
+ if isHaveWangFang {
|
|
|
+ points--
|
|
|
+ }
|
|
|
} else {
|
|
|
addType = 2
|
|
|
}
|