Browse Source

bug修改啊

limin 7 years ago
parent
commit
da0be70576
1 changed files with 11 additions and 8 deletions
  1. 11 8
      src/main/java/com/goafanti/user/controller/UserApiController.java

+ 11 - 8
src/main/java/com/goafanti/user/controller/UserApiController.java

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