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 824b91d..782a262 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
@@ -203,7 +203,6 @@ public class SysDeptServiceImpl implements ISysDeptService
         if (systemConfig.isAddRootCompany() && Objects.nonNull(sysDept.getParentId()) && sysDept.getParentId().equals(0L)) {
             SysUser sysUser = deptMapper.selectCompanyAdminByDept(deptId);
             sysDept.setSysUser(sysUser);
-            sysDept.setInitPassword(Sm4Utils.encrypt(sysDept.getInitPassword()));
         }
         return sysDept;
     }
@@ -302,7 +301,7 @@ public class SysDeptServiceImpl implements ISysDeptService
             dept.setAncestors("0");
             dept.setStatus("0");//默认启用
             dept.setMenuTemplateId(1L);//TODO 将来用前端传的模版ID
-            dept.setInitPassword(SecurityUtils.encryptPassword(dept.getSysUser().getPassword()));
+            //dept.setInitPassword(dept.getSysUser().getPassword());
             int result = deptMapper.insertDept(dept);
             if (systemConfig.isAddRootCompany() && result > 0) {
                 if (StringUtils.isNotNull(dept.getSysUser()) && !userService.checkUserNameUnique(dept.getSysUser())) {
@@ -450,7 +449,7 @@ public class SysDeptServiceImpl implements ISysDeptService
         log.info("创建公司管理员用户：{}",dept);
         SysUser user = dept.getSysUser();
         user.setCreateBy(SecurityUtils.getUsername());
-        user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
+        user.setPassword(SecurityUtils.encryptPassword(dept.getInitPassword()));
         user.setDeptId(dept.getDeptId());
         userMapper.insertUser(user);
         return user;
@@ -462,8 +461,8 @@ public class SysDeptServiceImpl implements ISysDeptService
     private void createCompanyAdminRole(SysDept sysDept, SysUser user) {
         log.info("部门信息{}，公司管理员用户{}",sysDept,user);
         SysRole role = new SysRole();
-        role.setRoleKey("dept_"+sysDept.getDeptId()+"_admin");
-        role.setRoleName("dept_"+sysDept.getDeptId()+"管理员");
+        role.setRoleKey("company_"+sysDept.getDeptId()+"_admin");
+        role.setRoleName("company_"+sysDept.getDeptId()+"_管理员");
         role.setRoleSort(0);
         role.setStatus("0");
         role.setCreateBy(SecurityUtils.getUsername());
@@ -508,6 +507,7 @@ public class SysDeptServiceImpl implements ISysDeptService
     private void updateCompanyAdminUserAndRole(SysDept dept) {
         SysUser oldCompanyAdmin = deptMapper.selectCompanyAdminByDept(dept.getDeptId());
         SysUser user = dept.getSysUser();
+        user.setPassword(SecurityUtils.encryptPassword(dept.getInitPassword()));
         user.setUpdateBy(SecurityUtils.getUsername());
         user.setUpdateTime(DateUtils.getNowDate());
         user.setDeptId(dept.getDeptId());
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 b689796..7167254 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
@@ -263,6 +263,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			left join sys_role sr on srd.role_id = sr.role_id
 			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} and sr.role_key LIKE 'dept_%_admin'
+		where sd.dept_id = #{deptId} and sr.role_key LIKE 'company_%_admin'
 	</select>
 </mapper>