|
@@ -2184,11 +2184,15 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService
|
|
|
if((companyUser.getIsAllowedAllRegister() !=null && companyUser.getIsAllowedAllRegister() != 1)){
|
|
if((companyUser.getIsAllowedAllRegister() !=null && companyUser.getIsAllowedAllRegister() != 1)){
|
|
|
return ResponseResult.fail(504,"当前销售禁止绑定会员,请联系销售!");
|
|
return ResponseResult.fail(504,"当前销售禁止绑定会员,请联系销售!");
|
|
|
}
|
|
}
|
|
|
|
|
+ // 使用 Stream API 检查是否包含 companyId
|
|
|
|
|
+ // 修正类型转换问题
|
|
|
if (companyUser.getIsNeedRegisterMember() == null || companyUser.getIsNeedRegisterMember() == 1
|
|
if (companyUser.getIsNeedRegisterMember() == null || companyUser.getIsNeedRegisterMember() == 1
|
|
|
- ||(ObjectUtils.isNotEmpty(fsUserCoursePeriod)
|
|
|
|
|
- &&ObjectUtils.isNotEmpty(fsUserCoursePeriod.getIsNeedRegisterMember())
|
|
|
|
|
- &&fsUserCoursePeriod.getIsNeedRegisterMember().equals(1))){
|
|
|
|
|
- return ResponseResult.fail(504,"请联系销售发送邀请链接成为会员!");
|
|
|
|
|
|
|
+ || (ObjectUtils.isNotEmpty(fsUserCoursePeriod)
|
|
|
|
|
+ && ObjectUtils.isNotEmpty(fsUserCoursePeriod.getIsNeedRegisterMember())
|
|
|
|
|
+ && Arrays.stream(fsUserCoursePeriod.getIsNeedRegisterMember().split(","))
|
|
|
|
|
+ .map(String::trim)
|
|
|
|
|
+ .anyMatch(id -> id.equals(String.valueOf(company.getCompanyId()))))) {
|
|
|
|
|
+ return ResponseResult.fail(504, "请联系销售发送邀请链接成为会员!");
|
|
|
}
|
|
}
|
|
|
int defaultStatus = (company != null ? company.getFsUserIsDefaultBlack() : 0) == 1 ? 0 : 1;
|
|
int defaultStatus = (company != null ? company.getFsUserIsDefaultBlack() : 0) == 1 ? 0 : 1;
|
|
|
userCompanyUser = userCompanyUserService.bindRelationship(param.getUserId(), courseProject, companyUser.getCompanyId(), companyUser.getUserId(), defaultStatus);
|
|
userCompanyUser = userCompanyUserService.bindRelationship(param.getUserId(), courseProject, companyUser.getCompanyId(), companyUser.getUserId(), defaultStatus);
|
|
@@ -2197,6 +2201,8 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService
|
|
|
|
|
|
|
|
// 逻辑调整:如果会员已经绑定了销售,直接提示,不添加重粉数据了-2025年6月16日14点53分
|
|
// 逻辑调整:如果会员已经绑定了销售,直接提示,不添加重粉数据了-2025年6月16日14点53分
|
|
|
if (!param.getCompanyUserId().equals(userCompanyUser.getCompanyUserId())){
|
|
if (!param.getCompanyUserId().equals(userCompanyUser.getCompanyUserId())){
|
|
|
|
|
+ log.error("进入::isAddCompanyUser 该用户fsUser={},companyUser={},param={}",fsUser,companyUser,param);
|
|
|
|
|
+
|
|
|
return ResponseResult.fail(500,"该用户("+fsUser.getUserId() + ")已成为其他销售会员");
|
|
return ResponseResult.fail(500,"该用户("+fsUser.getUserId() + ")已成为其他销售会员");
|
|
|
}
|
|
}
|
|
|
|
|
|