diff --git a/src/main/java/com/casic/accessControl/user/web/UserController.java b/src/main/java/com/casic/accessControl/user/web/UserController.java
index bbbe9be..9dfeb78 100644
--- a/src/main/java/com/casic/accessControl/user/web/UserController.java
+++ b/src/main/java/com/casic/accessControl/user/web/UserController.java
@@ -93,6 +93,7 @@
 
             userDto = userManager.getUserDtoById(id);
         }
+
         List<Role> roles = roleManager.getRoles();
         List<RoleDto> roleDtos = RoleDto.Converts(roles);
         List<Company> companies = companyManager.getCompanies(session);
@@ -110,12 +111,21 @@
         Map<String, Object> map = new HashMap<String, Object>();
         if (userDto!=null)
         {
+            // 新增用户，检查用户名是否重复
             if (userDto.getId() == null) {
                 if (userManager.getUserByName(userDto.getUserName()) != null) {//说明数据库中存在相同用户名的，不能新增该用户
                     map.put("success", false);
                     map.put("message", "数据库中存在相同用户名的人员，请更改用户名");
                     return map;
                 }
+            }else{
+                // 更新用户，检查用户名是否重复
+                User checkName = userManager.getUserByName(userDto.getUserName());
+                if (checkName != null && !checkName.getId().equals(userDto.getId())) {//说明数据库中存在相同用户名的，不能新增该用户
+                    map.put("success", false);
+                    map.put("message", "数据库中存在相同用户名的人员，不能保存");
+                    return map;
+                }
             }
             Company company = companyManager.get(userDto.getCompanyId());
             Role role = roleManager.get(userDto.getRoleId());