diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysDeptServiceImpl.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysDeptServiceImpl.java
index 09b27f3..93ef3d2 100644
--- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysDeptServiceImpl.java
+++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysDeptServiceImpl.java
@@ -2,6 +2,8 @@ package com.bonus.system.service.impl;
 
 import java.util.*;
 import java.util.stream.Collectors;
+
+import com.bonus.common.core.utils.DateUtils;
 import com.bonus.common.core.web.domain.BaseEntity;
 import com.bonus.config.SystemConfig;
 import com.bonus.system.api.domain.*;
@@ -454,7 +456,7 @@ public class SysDeptServiceImpl implements ISysDeptService
         log.info("部门信息{}，公司管理员用户{}",sysDept,user);
         SysRole role = new SysRole();
         role.setRoleKey("dept_"+sysDept.getDeptId()+"_admin");
-        role.setRoleName(sysDept.getDeptName()+"管理员");
+        role.setRoleName("dept_"+sysDept.getDeptId()+"管理员");
         role.setRoleSort(0);
         role.setStatus("0");
         role.setCreateBy(SecurityUtils.getUsername());
@@ -498,17 +500,19 @@ public class SysDeptServiceImpl implements ISysDeptService
      * @param dept
      */
     private void updateCompanyAdminUserAndRole(SysDept dept) {
+        SysUser oldSysUser = deptMapper.selectDeptAndUserById(dept.getDeptId());
         SysUser user = dept.getSysUser();
         user.setUpdateBy(SecurityUtils.getUsername());
+        user.setUpdateTime(DateUtils.getNowDate());
         user.setDeptId(dept.getDeptId());
-        SysRole role = new SysRole();
-        role.setRoleName(dept.getRoleName());
-        role.setUpdateBy(SecurityUtils.getUsername());
-        SysUser oldSysUser = deptMapper.selectDeptAndUserById(dept.getDeptId());
-        role.setRoleId(oldSysUser.getRoleId());
         user.setUserId(oldSysUser.getUserId());
         userMapper.updateUser(user);
-        roleMapper.updateRole(role);
+
+//        SysRole role = new SysRole();
+//        role.setUpdateTime(DateUtils.getNowDate());
+//        role.setUpdateBy(SecurityUtils.getUsername());
+//        role.setRoleId(oldSysUser.getRoleId());
+//        roleMapper.updateRole(role);
     }
 }
 
diff --git a/bonus-modules/bonus-system/src/main/resources/mapper/system/SysDeptMapper.xml b/bonus-modules/bonus-system/src/main/resources/mapper/system/SysDeptMapper.xml
index bb6cadf..6043f2c 100644
--- a/bonus-modules/bonus-system/src/main/resources/mapper/system/SysDeptMapper.xml
+++ b/bonus-modules/bonus-system/src/main/resources/mapper/system/SysDeptMapper.xml
@@ -252,7 +252,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			   sr.role_name as roleName,su.user_id as userId,sr.role_id as roleId, sd.dept_id as deptId
 		from sys_dept sd
 			left join sys_role_dept srd on sd.dept_id = srd.dept_id
-			left join sys_role sr on srd.role_id = sr.role_id and  sr.role_key LIKE '%admin%'
+			left join sys_role sr on srd.role_id = sr.role_id and  sr.role_key LIKE 'dept_%_admin'
 			left join sys_user_role sur on sur.role_id = sr.role_id
 			left join sys_user su on su.user_id = sur.user_id
 		where sd.dept_id = #{deptId}