diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/basic/controller/SysUserController.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/basic/controller/SysUserController.java
index 5241e6b..43f52a5 100644
--- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/basic/controller/SysUserController.java
+++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/basic/controller/SysUserController.java
@@ -68,7 +68,7 @@ public class SysUserController extends BaseController {
     @PostMapping("/addUser")
     @Log(title = "系统管理->人员信息->新增人员", businessType = BusinessType.INSERT)
     public AjaxResult add(@Validated @RequestBody SysUser user) {
-       return userService.insertUser(user);
+        return userService.insertUser(user);
     }
 
     /**
@@ -104,6 +104,9 @@ public class SysUserController extends BaseController {
             if (StringUtils.isNotEmpty(user.getIdNumber()) && !userService.checkIdNumberUnique(user)){
                 return error("修改用户'" + user.getUserName() + "'失败，身份证号已存在");
             }
+            if (StringUtils.isNotEmpty(user.getUserName()) && !userService.checkUserNameUnique(user)){
+                return error("修改用户'" + user.getUserName() + "'失败，用户名已存在");
+            }
             user.setUpdateBy(String.valueOf(SecurityUtils.getLoginUser().getSysUser().getUserId()));
             return toAjax(userService.updateUser(user));
         } catch (Exception e) {
@@ -187,13 +190,6 @@ public class SysUserController extends BaseController {
             // 组织集合
             List<MapVo> orgList = userService.getOrgByUserId(user);
             user.setOrgList(orgList);
-            // 获取考勤组
-            List<MapVo> attGroupList = userService.getAttGroupByUserId(user);
-            if(!attGroupList.isEmpty()){
-                user.setAttGroupId(attGroupList.get(0).getId());
-                user.setAttGroupName(attGroupList.get(0).getName());
-            }
-            user.setOrgList(orgList);
             // 角色集合
             Set<String> roles = sysMenuService.getRolePermission(user);
             // 权限集合
diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/basic/dao/SysUserMapper.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/basic/dao/SysUserMapper.java
index 7b13086..7c04c82 100644
--- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/basic/dao/SysUserMapper.java
+++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/basic/dao/SysUserMapper.java
@@ -15,7 +15,7 @@ import java.util.List;
 
 /**
  * 用户表 数据层
- * 
+ *
  * @author zys
  */
 @Mapper
@@ -24,7 +24,7 @@ public interface SysUserMapper
 
     /**
      * 通过用户名查询用户
-     * 
+     *
      * @param userName 用户名
      * @return 用户对象信息
      */
@@ -41,101 +41,101 @@ public interface SysUserMapper
     List<MapVo> getOrgByUserId(SysUser user);
 
     /**
-    * 查询用户列表
-    * @param bean
-    * @return List<SysUser>
-    */
+     * 查询用户列表
+     * @param bean
+     * @return List<SysUser>
+     */
     List<SysUser> selectUserList(SysUser bean);
 
     /**
-    * 查询角色列表
-    * @param
-    * @return
-    */
+     * 查询角色列表
+     * @param
+     * @return
+     */
     List<SysRole> getSelectRole();
 
     /**
-    * 新增用户
-    * @param user
-    * @return
-    */
+     * 新增用户
+     * @param user
+     * @return
+     */
     int insertUser(SysUser user);
 
 
     /**
-    * 新增用户岗位关联信息
-    * @param list
-    * @return
-    */
+     * 新增用户岗位关联信息
+     * @param list
+     * @return
+     */
     int insertUserPost(List<SysUserPost> list);
 
     /**
-    * 新增用户角色信息
-    * @param list
-    * @return
-    */
+     * 新增用户角色信息
+     * @param list
+     * @return
+     */
     int insertUserRole(List<SysUserRole> list);
 
     /**
-    * 新增用户组织信息
-    * @param list
-    * @return
-    */
+     * 新增用户组织信息
+     * @param list
+     * @return
+     */
     int insertUserOrg(List<SysUserOrg> list);
 
     /**
-    * 查询岗位列表
-    * @return
-    */
+     * 查询岗位列表
+     * @return
+     */
     List<SysDictData> getSelectPost();
 
     /**
-    * 删除用户组织信息
-    * @param userId
-    * @return
-    */
+     * 删除用户组织信息
+     * @param userId
+     * @return
+     */
     int deleteUserOrgByUserId(Long userId);
 
     /**
-    * 删除用户岗位信息
-    * @param userId
-    * @return
-    */
+     * 删除用户岗位信息
+     * @param userId
+     * @return
+     */
     int deleteUserPostByUserId(Long userId);
 
     /**
-    * 删除用户角色信息
-    * @param userId
-    * @return
-    */
+     * 删除用户角色信息
+     * @param userId
+     * @return
+     */
     int deleteUserRoleByUserId(Long userId);
 
     /**
-    * 删除用户信息
-    * @param userId
-    * @return
-    */
+     * 删除用户信息
+     * @param userId
+     * @return
+     */
     int deleteUserById(Long userId);
 
     /**
-    * 根据用户ID获取岗位ID
-    * @param userId
-    * @return
-    */
+     * 根据用户ID获取岗位ID
+     * @param userId
+     * @return
+     */
     Long[] getRoleIdsByUserId(Long userId);
 
     /**
-    * 根据用户ID获取组织ID
-    * @param userId
-    * @return
-    */
+     * 根据用户ID获取组织ID
+     * @param userId
+     * @return
+     */
     Long[] getOrgIdsByUserId(Long userId);
 
     /**
-    * 根据用户ID获取岗位ID
-    * @param userId
-    * @return
-    */
+     * 根据用户ID获取岗位ID
+     * @param userId
+     * @return
+     */
     Long[] getPostIdsByUserId(Long userId);
 
     /**
@@ -155,55 +155,60 @@ public interface SysUserMapper
     int updateUser(SysUser user);
 
     /**
-    * 根据岗位ID获取岗位ID
-    * @param postId
-    * @return
-    */
+     * 根据岗位ID获取岗位ID
+     * @param postId
+     * @return
+     */
     String selectPostIdById(Long postId);
 
     /**
-    * 获取组织列表
-    * @param
-    * @return
-    */
+     * 获取组织列表
+     * @param
+     * @return
+     */
     List<HolidayKeyBean> getOrgList();
 
     /**
-    * 获取角色列表
-    * @param
-    * @return
-    */
+     * 获取角色列表
+     * @param
+     * @return
+     */
     List<HolidayKeyBean> getRoleList();
 
     /**
-    * 获取岗位列表
-    * @param
-    * @return
-    */
+     * 获取岗位列表
+     * @param
+     * @return
+     */
     List<HolidayKeyBean> getPostList();
 
     /**
-    * 获取人员列表
-    * @param
-    * @return
-    */
+     * 获取人员列表
+     * @param
+     * @return
+     */
     List<SysUser> getSelectUser();
 
     /**
-    * 校验身份证号是否唯一
-    * @param idNumber
-    * @return
-    */
+     * 校验身份证号是否唯一
+     * @param idNumber
+     * @return
+     */
     SysUser checkIdNumberUnique(String idNumber);
 
     /**
-    * 根据用户名查询用户
-    * @param userName
-    * @return
-    */
+     * 根据用户名查询用户
+     * @param userName
+     * @return
+     */
     List<SysUser> selectUserByUserNames(String userName);
 
     List<SysUser> getSelectUserCurrent(Long userId);
 
-    List<MapVo> getAttGroupByUserId(SysUser user);
+    /**
+     * 校验身份证号是否唯一
+     * @param userName
+     * @return
+     */
+    SysUser checkUserNameUnique(String userName);
 }
diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/basic/service/SysUserService.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/basic/service/SysUserService.java
index 5729dee..3c4fdbf 100644
--- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/basic/service/SysUserService.java
+++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/basic/service/SysUserService.java
@@ -37,10 +37,10 @@ public interface SysUserService {
     List<MapVo> getOrgByUserId(SysUser user);
 
     /**
-    * 查询用户列表
-    * @param bean
-    * @return List<SysUser>
-    */
+     * 查询用户列表
+     * @param bean
+     * @return List<SysUser>
+     */
     List<SysUser> selectUserList(SysUser bean);
 
     /**
@@ -50,24 +50,24 @@ public interface SysUserService {
     AjaxResult getSelectRole();
 
     /**
-    * 新增用户
-    * @param user
-    * @return AjaxResult
-    */
+     * 新增用户
+     * @param user
+     * @return AjaxResult
+     */
     AjaxResult insertUser(SysUser user);
 
     /**
-    * 查询所有岗位
-    * @param
-    * @return
-    */
+     * 查询所有岗位
+     * @param
+     * @return
+     */
     AjaxResult getSelectPost();
 
     /**
-    * 删除用户信息
-    * @param userId
-    * @return
-    */
+     * 删除用户信息
+     * @param userId
+     * @return
+     */
     int deleteUserByIds(Long userId);
 
     /**
@@ -79,50 +79,55 @@ public interface SysUserService {
     boolean checkPhoneUnique(SysUser user);
 
     /**
-    * 修改用户信息
-    * @param user
-    * @return
-    */
+     * 修改用户信息
+     * @param user
+     * @return
+     */
     int updateUser(SysUser user);
 
     /**
-    * 导入用户数据
-    * @param file
+     * 导入用户数据
+     * @param file
      * @param request
      * @param response
-    * @return
-    */
+     * @return
+     */
     AjaxResult excelUpload(MultipartFile file, HttpServletRequest request, HttpServletResponse response);
 
     /**
-    * 查询所有用户
-    * @param
-    * @return
-    */
+     * 查询所有用户
+     * @param
+     * @return
+     */
     AjaxResult getSelectUser();
 
     /**
-    * 重置密码
-    * @param user
-    * @return
-    */
+     * 重置密码
+     * @param user
+     * @return
+     */
     AjaxResult resetPwd(SysUser user);
 
     /**
-    * 校验用户是否允许操作
-    * @param user
-    * @return
-    */
+     * 校验用户是否允许操作
+     * @param user
+     * @return
+     */
     boolean checkIdNumberUnique(SysUser user);
 
     /**
-    * 修改用户密码
-    * @param user
-    * @return
-    */
+     * 修改用户密码
+     * @param user
+     * @return
+     */
     AjaxResult updatePwd(SysUser user);
 
     AjaxResult getSelectUserCurrent();
 
-    List<MapVo> getAttGroupByUserId(SysUser user);
+    /**
+     * 校验用户是否允许操作
+     * @param user
+     * @return
+     */
+    boolean checkUserNameUnique(SysUser user);
 }
diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/basic/service/impl/SysUserServiceImpl.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/basic/service/impl/SysUserServiceImpl.java
index 823d997..5dfe67b 100644
--- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/basic/service/impl/SysUserServiceImpl.java
+++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/basic/service/impl/SysUserServiceImpl.java
@@ -40,7 +40,7 @@ import java.util.*;
 
 /**
  * 用户 业务层处理
- * 
+ *
  * @author zys
  */
 @Service
@@ -59,7 +59,7 @@ public class SysUserServiceImpl implements SysUserService
 
     /**
      * 通过用户名查询用户
-     * 
+     *
      * @param userName 用户名
      * @return 用户对象信息
      */
@@ -73,12 +73,6 @@ public class SysUserServiceImpl implements SysUserService
         //角色集合
         List<MapVo> orgList = userMapper.getOrgByUserId(sysUser);
         sysUser.setOrgList(orgList);
-        // 获取考勤组
-        List<MapVo> attGroupList = userMapper.getAttGroupByUserId(sysUser);
-        if(!attGroupList.isEmpty()){
-            sysUser.setAttGroupId(attGroupList.get(0).getId());
-            sysUser.setAttGroupName(attGroupList.get(0).getName());
-        }
         // 权限集合
         Set<String> permissions = sysMenuService.getMenuPermission(sysUser);
         LoginUser sysUserVo = new LoginUser();
@@ -167,6 +161,16 @@ public class SysUserServiceImpl implements SysUserService
         return UserConstants.UNIQUE;
     }
 
+    @Override
+    public boolean checkUserNameUnique(SysUser user) {
+        Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId();
+        SysUser info = userMapper.checkUserNameUnique(user.getUserName());
+        if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue()) {
+            return UserConstants.NOT_UNIQUE;
+        }
+        return UserConstants.UNIQUE;
+    }
+
     @Override
     public AjaxResult updatePwd(SysUser user) {
         try {
@@ -199,11 +203,6 @@ public class SysUserServiceImpl implements SysUserService
         }
     }
 
-    @Override
-    public List<MapVo> getAttGroupByUserId(SysUser user) {
-        return userMapper.getAttGroupByUserId(user);
-    }
-
     @Override
     @Transactional(rollbackFor = Exception.class)
     public int deleteUserByIds(Long userId) {
@@ -470,15 +469,15 @@ public class SysUserServiceImpl implements SysUserService
             //查询名称是否存在，若存在则查出所在部门
             List<SysUser> list2 =userMapper.selectUserByUserNames(user.getUserName());
             if (list2.size()>0){
-                //判断user.getOrgId是否在list2中
-                Long[] orgId = user.getOrgIds();
-                for (Long aLong : orgId){
-                    for (SysUser sysUser : list2) {
-                        if (Objects.equals(aLong+"", sysUser.getOrgId())){
-                            return AjaxResult.warn("该部门下该用户名已存在");
-                        }
-                    }
-                }
+//                //判断user.getOrgId是否在list2中
+//                Long[] orgId = user.getOrgIds();
+//                for (Long aLong : orgId){
+//                    for (SysUser sysUser : list2) {
+//                        if (Objects.equals(aLong+"", sysUser.getOrgId())){
+                return AjaxResult.warn("该用户名已存在");
+//                        }
+//                    }
+//                }
             }
             user.setCreateBy(String.valueOf(SecurityUtils.getLoginUser().getSysUser().getUserId()));
             user.setPassword(SecurityUtils.encryptPassword(SecurityConstants.DEFAULT_PASSWORD));
diff --git a/bonus-modules/bonus-system/src/main/resources/mapper/basic/SysUserMapper.xml b/bonus-modules/bonus-system/src/main/resources/mapper/basic/SysUserMapper.xml
index 09e52be..6d03565 100644
--- a/bonus-modules/bonus-system/src/main/resources/mapper/basic/SysUserMapper.xml
+++ b/bonus-modules/bonus-system/src/main/resources/mapper/basic/SysUserMapper.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+		PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+		"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.bonus.system.basic.dao.SysUserMapper">
 	<insert id="insertUser" keyColumn="user_id" useGeneratedKeys="true" keyProperty="userId">
 		insert into sys_user(
 		<if test="userName != null and userName != ''">user_name,</if>
 		<if test="phone != null and phone != ''">phone,</if>
 		<if test="idNumber != null and idNumber != ''">id_number,</if>
-	 	<if test="password != null and password != ''">password,</if>
+		<if test="password != null and password != ''">password,</if>
 		<if test="createBy != null and createBy != ''">create_user_id,</if>
 		<if test="isCadre != null and isCadre != ''">is_cadre,</if>
 		create_time
@@ -64,7 +64,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="password != null and password != ''">password = #{password},</if>
 			<if test="updateBy != null and updateBy != ''">update_user_id = #{updateBy},</if>
 			<if test="isCadre != null and isCadre != ''">is_cadre = #{isCadre},</if>
-		    update_time = sysdate()
+			update_time = sysdate()
 		</set>
 		where user_id = #{userId}
 	</update>
@@ -74,18 +74,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		where su.is_active = 1 and su.phone = #{userName}
 	</select>
 
-    <select id="selectUserById" resultType="com.bonus.system.api.domain.SysUser">
+	<select id="selectUserById" resultType="com.bonus.system.api.domain.SysUser">
 		select * from sys_user su
 		where su.user_id = #{userId}
 	</select>
-    <select id="getOrgByUserId" resultType="com.bonus.system.api.domain.MapVo">
+	<select id="getOrgByUserId" resultType="com.bonus.system.api.domain.MapVo">
 		SELECT
 			id,
 			`org_name` AS `name`
 		FROM
 			sys_organization
 		WHERE
-			id IN (
+				id IN (
 				SELECT
 					org_id
 				FROM
@@ -93,7 +93,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 				WHERE
 					user_id = #{userId})
 	</select>
-    <select id="selectUserList" resultType="com.bonus.system.api.domain.SysUser">
+	<select id="selectUserList" resultType="com.bonus.system.api.domain.SysUser">
 		SELECT
 		su.user_id AS userId,
 		su.user_name as userName,
@@ -252,16 +252,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			is_active = 1
 		  AND user_name IS NOT NULL and  user_id!=#{userId}
 	</select>
-	<select id="getAttGroupByUserId" resultType="com.bonus.system.api.domain.MapVo">
-		SELECT
-			ag.id,
-			ag.group_name AS `name`
-		FROM
-			att_group_person_relation agpr
-				LEFT JOIN att_group ag ON agpr.group_id = ag.id
-				AND ag.is_active = '1'
-		WHERE
-			agpr.user_id = #{userId} and agpr.is_active = '1' and ag.id is not null
-			LIMIT 1
+	<select id="checkUserNameUnique" resultType="com.bonus.system.api.domain.SysUser">
+		select user_id as userId, id_number as idNumber
+		from sys_user
+		where user_name = #{userName}
+		  and is_active = '1' limit 1
 	</select>
 </mapper>
\ No newline at end of file