|
|
@@ -537,6 +537,9 @@ public class UserApiController extends BaseApiController {
|
|
|
organizationIdentityService.insert(oi);
|
|
|
} else {
|
|
|
oi.setId(u.getId());
|
|
|
+ if(null == oi.getEnterpriseScale()){
|
|
|
+ oi.setEnterpriseScale("");
|
|
|
+ }
|
|
|
organizationIdentityService.updateByPrimaryKeySelective(oi);
|
|
|
}
|
|
|
user.setId(TokenManager.getUserId());
|
|
|
@@ -548,35 +551,35 @@ public class UserApiController extends BaseApiController {
|
|
|
|
|
|
private Result validation(InputOrganizationIdentity organizationIdentity, Result res) {
|
|
|
if(StringUtils.isBlank(organizationIdentity.getUid())) {
|
|
|
- res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "用户ID"));
|
|
|
+ res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "用户ID", "用户ID"));
|
|
|
return res;
|
|
|
}
|
|
|
if(StringUtils.isBlank(organizationIdentity.getQq())) {
|
|
|
- res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "企业QQ"));
|
|
|
+ res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "企业QQ", "企业QQ"));
|
|
|
return res;
|
|
|
}
|
|
|
if(StringUtils.isBlank(organizationIdentity.getIdentifyName())) {
|
|
|
- res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "单位名称"));
|
|
|
+ res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "单位名称", "单位名称"));
|
|
|
return res;
|
|
|
}
|
|
|
if(StringUtils.isBlank(organizationIdentity.getCompanyLogoUrl())) {
|
|
|
- res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "LOGO"));
|
|
|
+ res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "LOGO", "LOGO"));
|
|
|
return res;
|
|
|
}
|
|
|
if(StringUtils.isBlank(organizationIdentity.getBusinessScope())) {
|
|
|
- res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "业务范围"));
|
|
|
+ res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "业务范围", "业务范围"));
|
|
|
return res;
|
|
|
}
|
|
|
if(StringUtils.isBlank(organizationIdentity.getIntroduction())) {
|
|
|
- res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "单位简介"));
|
|
|
+ res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "企业简介", "企业简介"));
|
|
|
return res;
|
|
|
}
|
|
|
if(StringUtils.isBlank(organizationIdentity.getHonorPicture())) {
|
|
|
- res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "荣誉资质"));
|
|
|
+ res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "荣誉资质", "荣誉资质"));
|
|
|
return res;
|
|
|
}
|
|
|
if(StringUtils.isBlank(organizationIdentity.getEmail())) {
|
|
|
- res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "企业邮箱"));
|
|
|
+ res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "企业邮箱", "企业邮箱"));
|
|
|
return res;
|
|
|
}
|
|
|
/*if(null==organizationIdentity.getLicenceProvince()||null==organizationIdentity.getLicenceCity()) {
|