|
@@ -1013,9 +1013,11 @@ public class FsUserScrmServiceImpl implements IFsUserScrmService
|
|
|
int isDefaultBlack = company != null ? company.getFsUserIsDefaultBlack() : 0;
|
|
int isDefaultBlack = company != null ? company.getFsUserIsDefaultBlack() : 0;
|
|
|
|
|
|
|
|
// 添加关系表数据
|
|
// 添加关系表数据
|
|
|
|
|
+ boolean isNewBinding = false;
|
|
|
if (Objects.isNull(userCompanyUser)){
|
|
if (Objects.isNull(userCompanyUser)){
|
|
|
int defaultStatus = isDefaultBlack == 1 ? 0 : 1;
|
|
int defaultStatus = isDefaultBlack == 1 ? 0 : 1;
|
|
|
userCompanyUser = userCompanyUserService.bindRelationship(param.getUserId(), param.getProjectId(), companyUser.getCompanyId(), companyUser.getUserId(), defaultStatus);
|
|
userCompanyUser = userCompanyUserService.bindRelationship(param.getUserId(), param.getProjectId(), companyUser.getCompanyId(), companyUser.getUserId(), defaultStatus);
|
|
|
|
|
+ isNewBinding = true;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
// 不为空则添加新标签
|
|
// 不为空则添加新标签
|
|
@@ -1028,8 +1030,8 @@ public class FsUserScrmServiceImpl implements IFsUserScrmService
|
|
|
// this.setRepeatFansTag(param);
|
|
// this.setRepeatFansTag(param);
|
|
|
// }
|
|
// }
|
|
|
|
|
|
|
|
- //如果是设置了需要进入小黑屋,则需要返回提示,否则正常返回
|
|
|
|
|
- if(isDefaultBlack == 1){
|
|
|
|
|
|
|
+ // 如果是新绑定且设置了需要进入小黑屋,则需要返回提示,否则正常返回
|
|
|
|
|
+ if(isNewBinding && isDefaultBlack == 1){
|
|
|
return ResponseResult.fail(402, "已成功注册,待管理审核");
|
|
return ResponseResult.fail(402, "已成功注册,待管理审核");
|
|
|
}
|
|
}
|
|
|
return ResponseResult.ok(Boolean.TRUE);
|
|
return ResponseResult.ok(Boolean.TRUE);
|