diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EditInfoFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EditInfoFormDTO.java
index e8eb4249fa..7917113509 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EditInfoFormDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EditInfoFormDTO.java
@@ -37,11 +37,13 @@ public class EditInfoFormDTO implements Serializable {
 	 * 姓
 	 */
 	@NotBlank(message = "姓不能为空",groups = AddUserShowGroup.class)
+	@Length(max = 10,groups =AddUserShowGroup.class ,message = "姓不能超过10个字")
 	private String surname;
 	/**
 	 * 名
 	 */
 	@NotBlank(message = "名不能为空",groups = AddUserShowGroup.class)
+	@Length(max = 10,groups =AddUserShowGroup.class ,message = "名不能超过10个字")
 	private String name;
 
 	//@NotBlank(message = "身份证号不能为空")
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java
index 5970d78788..6785817934 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java
@@ -378,6 +378,8 @@ public class UserBaseInfoServiceImpl extends BaseServiceImpl<UserBaseInfoDao, Us
         userWechatDTO.setUpdatedTime(new Date());
         userWechatDTO.setUpdatedBy(param.getUserId());
         userWechatDao.updateByUserId(userWechatDTO);
+        //2.1、删除用户缓存信息
+        clearUserCache(Arrays.asList(param.getUserId()));
         //3、查看是否已经注册居民
         UserResiInfoDTO userResiInfoDTO = userResiInfoDao.selectByUserId(param.getUserId());
         if (null == userResiInfoDTO) {
@@ -399,8 +401,6 @@ public class UserBaseInfoServiceImpl extends BaseServiceImpl<UserBaseInfoDao, Us
                 return result;
             }
         }
-        //5、删除用户缓存信息
-        clearUserCache(Arrays.asList(param.getUserId()));
         return new Result();
     }