diff --git a/src/locales/langs/zh-cn.ts b/src/locales/langs/zh-cn.ts
index 067fcf2..d432c55 100644
--- a/src/locales/langs/zh-cn.ts
+++ b/src/locales/langs/zh-cn.ts
@@ -404,7 +404,7 @@ const local: App.I18n.Schema = {
         emptyLeader: '暂无负责人',
         userName: '用户名',
         userGender: '性别',
-        nickName: '昵称',
+        nickName: '用户昵称',
         deptName: '所属组织',
         positionName: '岗位',
         userPhone: '手机号',
@@ -422,7 +422,7 @@ const local: App.I18n.Schema = {
         form: {
           userName: '请输入用户名',
           userGender: '请选择性别',
-          nickName: '请输入昵称',
+          nickName: '请输入用户昵称',
           orgName: '请输入组织名称',
           orgCode: '请输入组织编码',
           orgTypeLabel: '请选择组织类型',
diff --git a/src/service/api/dict.ts b/src/service/api/dict.ts
index 09822ec..3daf039 100644
--- a/src/service/api/dict.ts
+++ b/src/service/api/dict.ts
@@ -104,7 +104,7 @@ export function fetchBatchDeleteDictData(ids: number[]) {
 }
 
 /** 通过岗位编码获取该字典的所有字典数据 */
-export function fetchGetDictDataByCode(code: String) {
+export function fetchGetDictDataByCode(code: string) {
   return request<Api.Dict.PageResult<Api.Dict.DictData>>({
     url: `${DICT_DATA_PREFIX}/code?code=${code}`,
     method: 'get'
diff --git a/src/typings/api/system-manage.d.ts b/src/typings/api/system-manage.d.ts
index 2ef8ec2..e9e3145 100644
--- a/src/typings/api/system-manage.d.ts
+++ b/src/typings/api/system-manage.d.ts
@@ -146,6 +146,7 @@ declare namespace Api {
       Pick<User, 'status'> &
         Pick<PageParams, 'pageNo' | 'pageSize'> & {
           username?: string;
+          nickname?: string;
           mobile?: string;
           deptId?: number;
           roleId?: number;
diff --git a/src/views/system/post/index.vue b/src/views/system/post/index.vue
index 9ec9af5..5cf7450 100644
--- a/src/views/system/post/index.vue
+++ b/src/views/system/post/index.vue
@@ -89,8 +89,8 @@ const { columns, columnChecks, data, loading, getData, getDataByPage, mobilePagi
   columns: () => [
     { prop: 'selection', type: 'selection', width: 48 },
     { prop: 'index', type: 'index', label: '序号', width: 64 },
-    { prop: 'name', label: '岗位名称', minWidth: 160, showOverflowTooltip: true },
-    { prop: 'code', label: '岗位编码', minWidth: 180, showOverflowTooltip: true },
+    { prop: 'name', label: '岗位名称', minWidth: 200, showOverflowTooltip: true },
+    { prop: 'code', label: '岗位编码', minWidth: 330, showOverflowTooltip: true },
     {
       prop: 'postType',
       label: '岗位类型',
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index 02f9a3f..e1ae59e 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -106,6 +106,7 @@ const { columns, columnChecks, data, loading, getData, getDataByPage, mobilePagi
       width: 196,
       align: 'center',
       fixed: 'right',
+      className: 'role-operate-column',
       formatter: row => (
         <BusinessTableActionCell
           actions={[
@@ -326,6 +327,21 @@ getMenuTreeData();
   background-color: rgb(64 158 255 / 8%);
 }
 
+// 修复固定列穿透问题：给操作列添加不透明背景
+:deep(.role-operate-column) {
+  background-color: var(--el-bg-color, #ffffff) !important;
+}
+// 选中行时操作列保持背景色
+:deep(.el-table__row.current-row) {
+  .role-operate-column {
+    background-color: var(--el-bg-color, #ffffff) !important;
+  }
+
+  td.el-table__cell.is-fixed-right {
+    background-color: var(--el-bg-color, #ffffff) !important;
+  }
+}
+
 :deep(.el-row) {
   margin: 0 0 -15px 0;
 }
diff --git a/src/views/system/user-management-relation/index.vue b/src/views/system/user-management-relation/index.vue
index 3c263ad..1313849 100644
--- a/src/views/system/user-management-relation/index.vue
+++ b/src/views/system/user-management-relation/index.vue
@@ -15,7 +15,7 @@
  * - 叶子节点：基层员工，没有下级
  */
 
-import { nextTick, onMounted, reactive, ref } from 'vue';
+import { computed, nextTick, onMounted, reactive, ref } from 'vue';
 import type { ElTree } from 'element-plus';
 import { ElButton, ElPopconfirm, ElTag } from 'element-plus';
 import { useBoolean } from '@sa/hooks';
@@ -35,14 +35,37 @@ defineOptions({ name: 'UserManagementRelation' });
  * 组件 userQuery 定义
  *
  * @param fromUserIndex 是否不是从管理链路 index 页面访问（从 user 页面访问时为 true）
+ * @param deptId 部门 ID
+ * @param orgType 组织类型（company/dept/direction/team）
  */
 interface userQuery {
   fromUserIndex?: boolean;
   deptId?: number | null;
+  orgType?: string;
 }
 
 // 从user的index组件访问管理链路，fromUserIndex为true，否则false; dept=100是灿能电力的id
-const { fromUserIndex = false, deptId = 100 } = defineProps<userQuery>();
+const { fromUserIndex = false, deptId = 100, orgType = 'company' } = defineProps<userQuery>();
+
+/**
+ * 判断节点是否为母节点（根节点）
+ *
+ * 母节点是指树形数据中的第一层节点
+ *
+ * @param data 节点数据
+ */
+function isRootNode(data: Api.SystemManage.UserManagementRelationTreeRespVO): boolean {
+  return treeData.value.some(node => node.userId === data.userId);
+}
+
+/**
+ * 判断母节点的编辑按钮是否应该隐藏
+ *
+ * 当组织类型为部门、方向或团队时，隐藏母节点的编辑按钮
+ */
+const shouldHideRootEdit = computed(() => {
+  return fromUserIndex && orgType !== 'company';
+});
 
 /**
  * 初始化搜索参数
@@ -379,7 +402,6 @@ onMounted(async () => {
           :data="treeData"
           :props="treeProps"
           node-key="userId"
-          default-expand-all
           :expand-on-click-node="false"
           @check="handleNodeCheck"
         >
@@ -389,14 +411,14 @@ onMounted(async () => {
                 <span>{{ node.label }}</span>
                 <!--                <ElTag v-if="data.managerNickname" size="small" type="info">上级：{{ data.managerNickname }}</ElTag>-->
               </span>
-              <div class="flex items-center">
+              <div class="flex items-center" style="min-width: 200px;">
                 <ElButton link type="primary" size="default" @click.stop="openAdd(data)">
                   <template #icon>
                     <icon-ic-round-plus class="text-icon" />
                   </template>
                   新增
                 </ElButton>
-                <ElButton link type="primary" size="small" @click.stop="openEdit(data)">
+                <ElButton v-if="!(isRootNode(data) && shouldHideRootEdit)" link type="primary" size="small" @click.stop="openEdit(data)">
                   <template #icon>
                     <icon-ic-round-edit class="text-icon" />
                   </template>
@@ -416,7 +438,6 @@ onMounted(async () => {
                     </ElButton>
                   </template>
                 </ElPopconfirm>
-                <span v-else-if="hasChildren(data)" style="margin-left: 56px"></span>
               </div>
             </div>
           </template>
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index f94ba38..0b1b3f6 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -38,7 +38,7 @@ function getInitSearchParams(): Api.SystemManage.UserSearchParams {
   return {
     pageNo: 1,
     pageSize: 10,
-    username: undefined,
+    nickname: undefined,
     mobile: undefined,
     status: undefined,
     deptId: undefined,
@@ -211,7 +211,7 @@ const {columns, columnChecks, data, loading, getDataByPage, mobilePagination} =
     {
       prop: 'positionName',
       label: $t('page.system.user.positionName'),
-      minWidth: 140,
+      minWidth: 200,
       showOverflowTooltip: true,
       formatter: row => getNullableLabel(row.positionName)
     },
@@ -772,7 +772,7 @@ onMounted(async () => {
       :show-footer="false"
       max-body-height="70vh"
     >
-      <UserManagementRelation :from-user-index="true" :dept-id="currentDeptId"/>
+      <UserManagementRelation :from-user-index="true" :dept-id="currentDeptId" :org-type="currentDept?.orgType"/>
     </BusinessFormDialog>
   </div>
 </template>
diff --git a/src/views/system/user/modules/user-search.vue b/src/views/system/user/modules/user-search.vue
index 29da050..b3e36ed 100644
--- a/src/views/system/user/modules/user-search.vue
+++ b/src/views/system/user/modules/user-search.vue
@@ -37,12 +37,12 @@ const model = defineModel<Api.SystemManage.UserSearchParams>('model', { required
     @search="$emit('search')"
   >
     <ElCol :lg="6" :md="8" :sm="12">
-      <ElFormItem :label="$t('page.system.user.userName')" prop="username">
+      <ElFormItem :label="$t('page.system.user.nickName')" prop="nickname">
         <ElInput
-          v-model="model.username"
+          v-model="model.nickname"
           clearable
           :disabled="disabled"
-          :placeholder="$t('page.system.user.form.userName')"
+          :placeholder="$t('page.system.user.form.nickName')"
         />
       </ElFormItem>
     </ElCol>