diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/mapper/SysDeptMapper.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/mapper/SysDeptMapper.java
index 3fad595..1e72c2f 100644
--- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/mapper/SysDeptMapper.java
+++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/mapper/SysDeptMapper.java
@@ -133,5 +133,5 @@ public interface SysDeptMapper
      * @param deptId
      * @return
      */
-    public SysUser selectDeptAndUserById(Long deptId);
+    public SysUser selectCompanyAdminByDept(Long deptId);
 }
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 93ef3d2..fe160d5 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
@@ -500,12 +500,12 @@ public class SysDeptServiceImpl implements ISysDeptService
      * @param dept
      */
     private void updateCompanyAdminUserAndRole(SysDept dept) {
-        SysUser oldSysUser = deptMapper.selectDeptAndUserById(dept.getDeptId());
+        SysUser oldCompanyAdmin = deptMapper.selectCompanyAdminByDept(dept.getDeptId());
         SysUser user = dept.getSysUser();
         user.setUpdateBy(SecurityUtils.getUsername());
         user.setUpdateTime(DateUtils.getNowDate());
         user.setDeptId(dept.getDeptId());
-        user.setUserId(oldSysUser.getUserId());
+        user.setUserId(oldCompanyAdmin.getUserId());
         userMapper.updateUser(user);
 
 //        SysRole role = new SysRole();
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 6043f2c..6dfdc84 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
@@ -247,7 +247,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		update sys_dept set del_flag = '2' where dept_id = #{deptId}
 	</delete>
 
-	<select id="selectDeptAndUserById" resultType="com.bonus.system.api.domain.SysUser">
+	<select id="selectCompanyAdminByDept" resultType="com.bonus.system.api.domain.SysUser">
 		select su.nick_name as nickName,su.user_name as userName,su.password as password,su.phonenumber as phonenumber,
 			   sr.role_name as roleName,su.user_id as userId,sr.role_id as roleId, sd.dept_id as deptId
 		from sys_dept sd