bug处理，普通成员注册名称优化

pdf-tech-core/src/main/java/cn/kdan/pdf/tech/core/service/impl/VppMemberServiceImpl.java

@@ -152,6 +152,10 @@ public class VppMemberServiceImpl implements VppMemberService {
 
     @Override
     public Boolean createTrial(VppMemberRegisterParam param) {
+        // 公司名是否已存在
+        if (!ObjectUtils.isEmpty(vppCompanyService.getByName(param.getCompany()))) {
+            throw new BackendRuntimeException(VppMemberConstant.EXCEPTION_MSG_COMPANY_EXIST);
+        }
         // 校验
         validRegisterParam(param);
         // 发送http请求
@@ -295,10 +299,6 @@ public class VppMemberServiceImpl implements VppMemberService {
         if (!ObjectUtils.isEmpty(getByAccount(param.getEmail()))) {
             throw new BackendRuntimeException(VppMemberConstant.EXCEPTION_MSG_EMAIL_EXIST);
         }
-        // 公司名是否已存在
-        if (!ObjectUtils.isEmpty(vppCompanyService.getByName(param.getCompany()))) {
-            throw new BackendRuntimeException(VppMemberConstant.EXCEPTION_MSG_COMPANY_EXIST);
-        }
         //验证邮箱格式
         String emailRegex = CommonConstant.emailRegex;
         if (!param.getEmail().matches(emailRegex)) {

pdf-tech-core/src/main/java/cn/kdan/pdf/tech/core/service/impl/VppTeamServiceImpl.java

@@ -693,15 +693,18 @@ public class VppTeamServiceImpl implements VppTeamService {
             }
         }
         String code = CommonUtils.generateVerifyCode();
+        VppCompany vppCompany = vppCompanyService.getById(member.getCompanyId());
         if (ObjectUtils.isEmpty(vppMember)) {
-            VppCompany vppCompany = vppCompanyService.getById(member.getCompanyId());
             actionEnum = CaptchaActionEnum.USER_REGISTER_FOR_ADD_ADMIN;
             //发送注册邮件，前端根据注册页面表单信息和teamIds,还有code去进行注册
             String url = webUrl + createUrl +"?teamIds=" + teamString + "&code=" + code + "&action=" + actionEnum.value() + "&account=" + account;
             //用户邮箱 超管邮箱  链接
             text = String.format(CaptchaActionEnum.USER_REGISTER_FOR_ADD_ADMIN.text(), account, vppCompany.getName(), url, account);
         } else {
-            VppCompany vppCompany = vppCompanyService.getById(vppMember.getCompanyId());
+            // 判断是否有用户名，没有的用邮箱替换
+            if (StringUtils.isEmpty(vppMember.getFullName())) {
+                vppMember.setFullName(vppMember.getEmail());
+            }
             // 用户管理的所有团队提取备用
             List<VppRTeamMemberRoleVO> rTeamMemberRoles = vppRTeamMemberRoleService.listByMemberIdAdmin(vppMember.getId());
             Map<String, List<VppRTeamMemberRoleVO>> teamMap = rTeamMemberRoles.stream().collect(Collectors.groupingBy(VppRTeamMemberRoleVO::getTeamId));