From 18e466f6822f97b0035660b7d09deed8dce81a89 Mon Sep 17 00:00:00 2001
From: zds <49744633+zds-s@users.noreply.github.com>
Date: Mon, 3 Mar 2025 03:13:15 +0800
Subject: [PATCH 01/91] feat(migration): create department, position, and user
 association tables

---
 ..._02_24_195620_create_department_tables.php | 83 +++++++++++++++++++
 1 file changed, 83 insertions(+)
 create mode 100644 databases/migrations/2025_02_24_195620_create_department_tables.php

diff --git a/databases/migrations/2025_02_24_195620_create_department_tables.php b/databases/migrations/2025_02_24_195620_create_department_tables.php
new file mode 100644
index 000000000..ade3c6731
--- /dev/null
+++ b/databases/migrations/2025_02_24_195620_create_department_tables.php
@@ -0,0 +1,83 @@
+<?php
+
+use Hyperf\Database\Schema\Schema;
+use Hyperf\Database\Schema\Blueprint;
+use Hyperf\Database\Migrations\Migration;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::create('department', function (Blueprint $table) {
+            $table->comment('部门表');
+            $table->bigIncrements('id');
+            $table->string('name', 50);
+            $table->bigInteger('parent_id')->default(0);
+            $table->datetimes();
+            $table->softDeletes();
+        });
+        Schema::create('position', function (Blueprint $table) {
+            $table->comment('岗位表');
+            $table->bigIncrements('id');
+            $table->string('name', 50);
+            $table->bigInteger('dept_id');
+            $table->datetimes();
+            $table->softDeletes();
+        });
+        Schema::create('user_dept', function (Blueprint $table) {
+            $table->comment('用户-部门关联表');
+            $table->bigInteger('user_id');
+            $table->bigInteger('dept_id');
+            $table->datetimes();
+            $table->softDeletes();
+        });
+        Schema::create('user_position', function (Blueprint $table) {
+            $table->comment('用户-岗位关联表');
+            $table->bigInteger('user_id');
+            $table->bigInteger('position_id');
+            $table->datetimes();
+            $table->softDeletes();
+        });
+        Schema::create('dept_leader', function (Blueprint $table) {
+            $table->comment('部门领导表');
+            $table->bigInteger('dept_id');
+            $table->bigInteger('user_id');
+            $table->datetimes();
+            $table->softDeletes();
+        });
+        Schema::create('data_permission_policy', function (Blueprint $table) {
+            $table->comment('数据权限策略');
+            $table->bigIncrements('id');
+            $table->bigInteger('user_id')->comment('用户ID（与角色二选一）');
+            $table->bigInteger('role_id')->comment('角色ID（与用户二选一）');
+            $table->string('policy_type', 20)->comment('策略类型（DEPT_SELF, DEPT_TREE, ALL, SELF, CUSTOM_DEPT, CUSTOM_FUNC）');
+            $table->boolean('is_default')->default(true)->comment('是否默认策略（默认值：true）');
+            $table->datetimes();
+            $table->softDeletes();
+        });
+        Schema::create('data_permission_custom_func', function (Blueprint $table) {
+            $table->comment('自定义回调函数表');
+            $table->bigInteger('policy_id');
+            $table->string('func_key', 50);
+            $table->datetimes();
+            $table->softDeletes();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::dropIfExists('department');
+        Schema::dropIfExists('position');
+        Schema::dropIfExists('user_dept');
+        Schema::dropIfExists('user_position');
+        Schema::dropIfExists('dept_leader');
+        Schema::dropIfExists('data_permission_policy');
+        Schema::dropIfExists('data_permission_custom_func');
+    }
+};

From 0c6a843aac8c33c9ea4edd8671818caa260e3850 Mon Sep 17 00:00:00 2001
From: zds <49744633+zds-s@users.noreply.github.com>
Date: Mon, 3 Mar 2025 03:47:13 +0800
Subject: [PATCH 02/91] feat(database): enhance department and position tables
 with comments and defaults; add PolicyType enum for data permission policies

---
 .../Enums/DataPermissionPolicy/PolicyType.php | 81 +++++++++++++++++++
 app/Model/Permission/DataPermissionPolicy.php | 38 +++++++++
 app/Model/Permission/Department.php           | 58 +++++++++++++
 app/Model/Permission/Position.php             | 51 ++++++++++++
 ..._02_24_195620_create_department_tables.php | 16 ++--
 5 files changed, 236 insertions(+), 8 deletions(-)
 create mode 100644 app/Model/Enums/DataPermissionPolicy/PolicyType.php
 create mode 100644 app/Model/Permission/DataPermissionPolicy.php
 create mode 100644 app/Model/Permission/Department.php
 create mode 100644 app/Model/Permission/Position.php

diff --git a/app/Model/Enums/DataPermissionPolicy/PolicyType.php b/app/Model/Enums/DataPermissionPolicy/PolicyType.php
new file mode 100644
index 000000000..f7e0f9ad6
--- /dev/null
+++ b/app/Model/Enums/DataPermissionPolicy/PolicyType.php
@@ -0,0 +1,81 @@
+<?php
+
+namespace App\Model\Enums\DataPermissionPolicy;
+
+/**
+ * 策略类型（DEPT_SELF, DEPT_TREE, ALL, SELF, CUSTOM_DEPT, CUSTOM_FUNC）
+ */
+enum PolicyType: string
+{
+    case DeptSelf = 'DEPT_SELF';
+
+    case DeptTree = 'DEPT_TREE';
+
+    case All = 'ALL';
+
+    case Self = 'SELF';
+
+    case CustomDept = 'CUSTOM_DEPT';
+
+    case CustomFunc = 'CUSTOM_FUNC';
+
+    public function isDeptSelf(): bool
+    {
+        return $this === self::DeptSelf;
+    }
+
+    public function isDeptTree(): bool
+    {
+        return $this === self::DeptTree;
+    }
+
+    public function isAll(): bool
+    {
+        return $this === self::All;
+    }
+
+    public function isSelf(): bool
+    {
+        return $this === self::Self;
+    }
+
+    public function isCustomDept(): bool
+    {
+        return $this === self::CustomDept;
+    }
+
+    public function isCustomFunc(): bool
+    {
+        return $this === self::CustomFunc;
+    }
+
+    public function isNotDeptSelf(): bool
+    {
+        return !$this->isDeptSelf();
+    }
+
+    public function isNotDeptTree(): bool
+    {
+        return !$this->isDeptTree();
+    }
+
+    public function isNotAll(): bool
+    {
+        return !$this->isAll();
+    }
+
+    public function isNotSelf(): bool
+    {
+        return !$this->isSelf();
+    }
+
+    public function isNotCustomDept(): bool
+    {
+        return !$this->isCustomDept();
+    }
+
+    public function isNotCustomFunc(): bool
+    {
+        return !$this->isCustomFunc();
+    }
+}
diff --git a/app/Model/Permission/DataPermissionPolicy.php b/app/Model/Permission/DataPermissionPolicy.php
new file mode 100644
index 000000000..5e9b9bea3
--- /dev/null
+++ b/app/Model/Permission/DataPermissionPolicy.php
@@ -0,0 +1,38 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Model\Permission;
+
+use Carbon\Carbon;
+use Hyperf\Database\Model\SoftDeletes;
+use Hyperf\DbConnection\Model\Model;
+
+/**
+ * @property int $id 
+ * @property int $user_id 用户ID（与角色二选一）
+ * @property int $role_id 角色ID（与用户二选一）
+ * @property string $policy_type 策略类型（DEPT_SELF, DEPT_TREE, ALL, SELF, CUSTOM_DEPT, CUSTOM_FUNC）
+ * @property bool $is_default 是否默认策略（默认值：true）
+ * @property Carbon $created_at
+ * @property Carbon $updated_at
+ * @property Carbon $deleted_at
+ */
+class DataPermissionPolicy extends Model
+{
+    use SoftDeletes;
+    /**
+     * The table associated with the model.
+     */
+    protected ?string $table = 'data_permission_policy';
+
+    /**
+     * The attributes that are mass assignable.
+     */
+    protected array $fillable = ['id', 'user_id', 'role_id', 'policy_type', 'is_default', 'created_at', 'updated_at', 'deleted_at'];
+
+    /**
+     * The attributes that should be cast to native types.
+     */
+    protected array $casts = ['id' => 'integer', 'user_id' => 'integer', 'role_id' => 'integer', 'is_default' => 'bool', 'created_at' => 'datetime', 'updated_at' => 'datetime', 'deleted_at' => 'datetime'];
+}
diff --git a/app/Model/Permission/Department.php b/app/Model/Permission/Department.php
new file mode 100644
index 000000000..d42146a7f
--- /dev/null
+++ b/app/Model/Permission/Department.php
@@ -0,0 +1,58 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Model\Permission;
+
+use Carbon\Carbon;
+use Hyperf\Database\Model\Collection;
+use Hyperf\Database\Model\Relations\BelongsToMany;
+use Hyperf\Database\Model\Relations\HasMany;
+use Hyperf\Database\Model\SoftDeletes;
+use Hyperf\DbConnection\Model\Model;
+
+/**
+ * @property int $id 
+ * @property string $name 部门名称
+ * @property int $parent_id 父级部门ID
+ * @property Carbon $created_at
+ * @property Carbon $updated_at
+ * @property Carbon $deleted_at
+ * @property-read Position[]|Collection<int,Position> $positions 岗位
+ * @property-read User[]|Collection<int,User> $department_users 部门用户
+ * @property-read User[]|Collection<int,User> $leader 部门领导
+ */
+class Department extends Model
+{
+    use SoftDeletes;
+    /**
+     * The table associated with the model.
+     */
+    protected ?string $table = 'department';
+
+    /**
+     * The attributes that are mass assignable.
+     */
+    protected array $fillable = ['id', 'name', 'parent_id', 'created_at', 'updated_at', 'deleted_at'];
+
+    /**
+     * The attributes that should be cast to native types.
+     */
+    protected array $casts = ['id' => 'integer', 'parent_id' => 'integer', 'created_at' => 'datetime', 'updated_at' => 'datetime', 'deleted_at' => 'datetime'];
+
+    public function positions(): HasMany
+    {
+        return $this->hasMany(Position::class, 'dept_id', 'id');
+    }
+
+    public function department_users(): BelongsToMany
+    {
+        return $this->belongsToMany(User::class, 'user_dept', 'dept_id', 'user_id');
+    }
+
+    public function leaders(): BelongsToMany
+    {
+        return $this->belongsToMany(User::class, 'user_leader', 'dept_id', 'user_id');
+    }
+
+}
diff --git a/app/Model/Permission/Position.php b/app/Model/Permission/Position.php
new file mode 100644
index 000000000..3742b68ef
--- /dev/null
+++ b/app/Model/Permission/Position.php
@@ -0,0 +1,51 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Model\Permission;
+
+use Carbon\Carbon;
+use Hyperf\Database\Model\Relations\BelongsTo;
+use Hyperf\Database\Model\Relations\BelongsToMany;
+use Hyperf\Database\Model\SoftDeletes;
+use Hyperf\DbConnection\Model\Model;
+use Hyperf\Database\Model\Collection;
+
+/**
+ * @property int $id 
+ * @property string $name 岗位名称
+ * @property int $dept_id 部门ID
+ * @property Carbon $created_at
+ * @property Carbon $updated_at
+ * @property Carbon $deleted_at
+ * @property Department|null $department
+ * @property-read User[]|Collection<int,User> $users
+ */
+class Position extends Model
+{
+    use SoftDeletes;
+    /**
+     * The table associated with the model.
+     */
+    protected ?string $table = 'position';
+
+    /**
+     * The attributes that are mass assignable.
+     */
+    protected array $fillable = ['id', 'name', 'dept_id', 'created_at', 'updated_at', 'deleted_at'];
+
+    /**
+     * The attributes that should be cast to native types.
+     */
+    protected array $casts = ['id' => 'integer', 'dept_id' => 'integer', 'created_at' => 'datetime', 'updated_at' => 'datetime', 'deleted_at' => 'datetime'];
+
+    public function department(): BelongsTo
+    {
+        return $this->belongsTo(Department::class, 'dept_id', 'id');
+    }
+
+    public function users(): BelongsToMany
+    {
+        return $this->belongsToMany(User::class, 'user_position', 'position_id', 'user_id');
+    }
+}
diff --git a/databases/migrations/2025_02_24_195620_create_department_tables.php b/databases/migrations/2025_02_24_195620_create_department_tables.php
index ade3c6731..00eefdd73 100644
--- a/databases/migrations/2025_02_24_195620_create_department_tables.php
+++ b/databases/migrations/2025_02_24_195620_create_department_tables.php
@@ -14,16 +14,16 @@ public function up(): void
         Schema::create('department', function (Blueprint $table) {
             $table->comment('部门表');
             $table->bigIncrements('id');
-            $table->string('name', 50);
-            $table->bigInteger('parent_id')->default(0);
+            $table->string('name', 50)->comment('部门名称');
+            $table->bigInteger('parent_id')->default(0)->comment('父级部门ID');
             $table->datetimes();
             $table->softDeletes();
         });
         Schema::create('position', function (Blueprint $table) {
             $table->comment('岗位表');
             $table->bigIncrements('id');
-            $table->string('name', 50);
-            $table->bigInteger('dept_id');
+            $table->string('name', 50)->comment('岗位名称');
+            $table->bigInteger('dept_id')->comment('部门ID');
             $table->datetimes();
             $table->softDeletes();
         });
@@ -51,8 +51,8 @@ public function up(): void
         Schema::create('data_permission_policy', function (Blueprint $table) {
             $table->comment('数据权限策略');
             $table->bigIncrements('id');
-            $table->bigInteger('user_id')->comment('用户ID（与角色二选一）');
-            $table->bigInteger('role_id')->comment('角色ID（与用户二选一）');
+            $table->bigInteger('user_id')->default(0)->comment('用户ID（与角色二选一）');
+            $table->bigInteger('role_id')->default(0)->comment('角色ID（与用户二选一）');
             $table->string('policy_type', 20)->comment('策略类型（DEPT_SELF, DEPT_TREE, ALL, SELF, CUSTOM_DEPT, CUSTOM_FUNC）');
             $table->boolean('is_default')->default(true)->comment('是否默认策略（默认值：true）');
             $table->datetimes();
@@ -60,8 +60,8 @@ public function up(): void
         });
         Schema::create('data_permission_custom_func', function (Blueprint $table) {
             $table->comment('自定义回调函数表');
-            $table->bigInteger('policy_id');
-            $table->string('func_key', 50);
+            $table->bigInteger('policy_id')->comment('数据权限策略ID');
+            $table->string('func_key', 50)->comment('回调函数KEY');
             $table->datetimes();
             $table->softDeletes();
         });

From 299ec61ff359c429a58d7e5325aaeb0a9af2bc90 Mon Sep 17 00:00:00 2001
From: zds <49744633+zds-s@users.noreply.github.com>
Date: Mon, 3 Mar 2025 03:49:39 +0800
Subject: [PATCH 03/91] feat(model): update DataPermissionPolicy to use
 PolicyType enum for policy_type property

---
 app/Model/Permission/DataPermissionPolicy.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/Model/Permission/DataPermissionPolicy.php b/app/Model/Permission/DataPermissionPolicy.php
index 5e9b9bea3..8fed74f0d 100644
--- a/app/Model/Permission/DataPermissionPolicy.php
+++ b/app/Model/Permission/DataPermissionPolicy.php
@@ -4,6 +4,7 @@
 
 namespace App\Model\Permission;
 
+use App\Model\Enums\DataPermissionPolicy\PolicyType;
 use Carbon\Carbon;
 use Hyperf\Database\Model\SoftDeletes;
 use Hyperf\DbConnection\Model\Model;
@@ -12,7 +13,7 @@
  * @property int $id 
  * @property int $user_id 用户ID（与角色二选一）
  * @property int $role_id 角色ID（与用户二选一）
- * @property string $policy_type 策略类型（DEPT_SELF, DEPT_TREE, ALL, SELF, CUSTOM_DEPT, CUSTOM_FUNC）
+ * @property PolicyType $policy_type 策略类型（DEPT_SELF, DEPT_TREE, ALL, SELF, CUSTOM_DEPT, CUSTOM_FUNC）
  * @property bool $is_default 是否默认策略（默认值：true）
  * @property Carbon $created_at
  * @property Carbon $updated_at
@@ -34,5 +35,10 @@ class DataPermissionPolicy extends Model
     /**
      * The attributes that should be cast to native types.
      */
-    protected array $casts = ['id' => 'integer', 'user_id' => 'integer', 'role_id' => 'integer', 'is_default' => 'bool', 'created_at' => 'datetime', 'updated_at' => 'datetime', 'deleted_at' => 'datetime'];
+    protected array $casts = [
+        'id' => 'integer', 'user_id' => 'integer', 'role_id' => 'integer',
+        'is_default' => 'bool', 'created_at' => 'datetime',
+        'updated_at' => 'datetime', 'deleted_at' => 'datetime',
+        'policy_type' => PolicyType::class
+    ];
 }

From 8d195745c9e0f14f873f778e755ba83d1af123f8 Mon Sep 17 00:00:00 2001
From: zds <49744633+zds-s@users.noreply.github.com>
Date: Mon, 3 Mar 2025 03:54:53 +0800
Subject: [PATCH 04/91] feat: refactor DataPermissionPolicy and PolicyType to
 improve namespace structure and enhance role/user associations

---
 .../Policy.php}                                          | 6 +++---
 .../PolicyType.php                                       | 2 +-
 app/Model/Permission/Role.php                            | 9 +++++++++
 app/Model/Permission/User.php                            | 9 +++++++++
 4 files changed, 22 insertions(+), 4 deletions(-)
 rename app/Model/{Permission/DataPermissionPolicy.php => DataPermission/Policy.php} (90%)
 rename app/Model/Enums/{DataPermissionPolicy => DataPermission}/PolicyType.php (96%)

diff --git a/app/Model/Permission/DataPermissionPolicy.php b/app/Model/DataPermission/Policy.php
similarity index 90%
rename from app/Model/Permission/DataPermissionPolicy.php
rename to app/Model/DataPermission/Policy.php
index 8fed74f0d..fdc818821 100644
--- a/app/Model/Permission/DataPermissionPolicy.php
+++ b/app/Model/DataPermission/Policy.php
@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-namespace App\Model\Permission;
+namespace App\Model\DataPermission;
 
-use App\Model\Enums\DataPermissionPolicy\PolicyType;
+use App\Model\Enums\DataPermission\PolicyType;
 use Carbon\Carbon;
 use Hyperf\Database\Model\SoftDeletes;
 use Hyperf\DbConnection\Model\Model;
@@ -19,7 +19,7 @@
  * @property Carbon $updated_at
  * @property Carbon $deleted_at
  */
-class DataPermissionPolicy extends Model
+class Policy extends Model
 {
     use SoftDeletes;
     /**
diff --git a/app/Model/Enums/DataPermissionPolicy/PolicyType.php b/app/Model/Enums/DataPermission/PolicyType.php
similarity index 96%
rename from app/Model/Enums/DataPermissionPolicy/PolicyType.php
rename to app/Model/Enums/DataPermission/PolicyType.php
index f7e0f9ad6..cbaaffb99 100644
--- a/app/Model/Enums/DataPermissionPolicy/PolicyType.php
+++ b/app/Model/Enums/DataPermission/PolicyType.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Model\Enums\DataPermissionPolicy;
+namespace App\Model\Enums\DataPermission;
 
 /**
  * 策略类型（DEPT_SELF, DEPT_TREE, ALL, SELF, CUSTOM_DEPT, CUSTOM_FUNC）
diff --git a/app/Model/Permission/Role.php b/app/Model/Permission/Role.php
index 8a9762d32..d0ad80364 100644
--- a/app/Model/Permission/Role.php
+++ b/app/Model/Permission/Role.php
@@ -12,10 +12,12 @@
 
 namespace App\Model\Permission;
 
+use App\Model\DataPermission\Policy;
 use App\Model\Enums\User\Status;
 use Carbon\Carbon;
 use Hyperf\Database\Model\Collection;
 use Hyperf\Database\Model\Events\Deleting;
+use Hyperf\Database\Model\Relations\BelongsTo;
 use Hyperf\Database\Model\Relations\BelongsToMany;
 use Hyperf\DbConnection\Model\Model as MineModel;
 
@@ -33,6 +35,7 @@
  * @property string $remark 备注
  * @property Collection|Menu[] $menus
  * @property Collection|User[] $users
+ * @property Policy|null $policy 数据权限策略
  */
 final class Role extends MineModel
 {
@@ -90,4 +93,10 @@ public function deleting(Deleting $event)
         $this->users()->detach();
         $this->menus()->detach();
     }
+
+
+    public function policy(): BelongsTo
+    {
+        return $this->belongsTo(Policy::class, 'policy_id', 'id');
+    }
 }
diff --git a/app/Model/Permission/User.php b/app/Model/Permission/User.php
index 313b47282..215281271 100644
--- a/app/Model/Permission/User.php
+++ b/app/Model/Permission/User.php
@@ -12,12 +12,14 @@
 
 namespace App\Model\Permission;
 
+use App\Model\DataPermission\Policy;
 use App\Model\Enums\User\Status;
 use App\Model\Enums\User\Type;
 use Carbon\Carbon;
 use Hyperf\Collection\Collection;
 use Hyperf\Database\Model\Events\Creating;
 use Hyperf\Database\Model\Events\Deleted;
+use Hyperf\Database\Model\Relations\BelongsTo;
 use Hyperf\Database\Model\Relations\BelongsToMany;
 use Hyperf\DbConnection\Model\Model;
 
@@ -41,6 +43,7 @@
  * @property string $remark 备注
  * @property null|Collection|Role[] $roles
  * @property mixed $password 密码
+ * @property Policy|null $policy 数据权限策略
  */
 final class User extends Model
 {
@@ -136,4 +139,10 @@ public function hasPermission(string $permission): bool
     {
         return $this->roles()->whereRelation('menus', 'name', $permission)->exists();
     }
+
+
+    public function policy(): BelongsTo
+    {
+        return $this->belongsTo(Policy::class, 'id', 'id');
+    }
 }

From ccd5355e140242ef9d05c315935f46262863d8d5 Mon Sep 17 00:00:00 2001
From: zds <49744633+zds-s@users.noreply.github.com>
Date: Thu, 6 Mar 2025 00:16:23 +0800
Subject: [PATCH 05/91] feat: enhance role and policy management with new
 schema and properties

---
 .../Admin/Request/Permission/RoleRequest.php  | 21 ++++++++-
 app/Model/DataPermission/Policy.php           | 16 +++++--
 app/Model/Enums/DataPermission/PolicyType.php | 29 +++++++-----
 app/Model/Permission/Department.php           | 18 +++++---
 app/Model/Permission/Position.php             | 17 +++++--
 app/Model/Permission/Role.php                 |  3 +-
 app/Model/Permission/User.php                 |  3 +-
 app/Repository/Permission/RoleRepository.php  | 23 ++++++----
 app/Schema/PolicySchema.php                   | 45 +++++++++++++++++++
 app/Schema/RoleSchema.php                     |  6 ++-
 app/Service/Permission/RoleService.php        | 33 ++++++++++++++
 ..._02_24_195620_create_department_tables.php |  8 +---
 12 files changed, 176 insertions(+), 46 deletions(-)
 create mode 100644 app/Schema/PolicySchema.php

diff --git a/app/Http/Admin/Request/Permission/RoleRequest.php b/app/Http/Admin/Request/Permission/RoleRequest.php
index ab9d96fa8..b1188d2e9 100644
--- a/app/Http/Admin/Request/Permission/RoleRequest.php
+++ b/app/Http/Admin/Request/Permission/RoleRequest.php
@@ -14,13 +14,15 @@
 
 use App\Http\Common\Request\Traits\HttpMethodTrait;
 use App\Http\Common\Request\Traits\NoAuthorizeTrait;
+use App\Model\Enums\DataPermission\PolicyType;
 use App\Schema\RoleSchema;
 use Hyperf\Validation\Request\FormRequest;
+use Hyperf\Validation\Rule;
 
 #[\Mine\Swagger\Attributes\FormRequest(
     schema: RoleSchema::class,
     only: [
-        'name', 'code', 'status', 'sort', 'remark',
+        'name', 'code', 'status', 'sort', 'remark', 'policy',
     ]
 )]
 class RoleRequest extends FormRequest
@@ -41,6 +43,23 @@ public function rules(): array
             'status' => 'sometimes|integer|in:1,2',
             'sort' => 'required|integer',
             'remark' => 'nullable|string|max:255',
+            'policy' => 'nullable|array',
+            'policy.*.policy_type' => [
+                'required_with:policy',
+                'string',
+                'max:10',
+                Rule::enum(PolicyType::class),
+            ],
+            'policy.*.value' => [
+                'required_with:policy',
+                'array',
+                'min:1',
+            ],
+            'policy.*.is_default' => [
+                'required_with:policy',
+                'integer',
+                'in:0,1',
+            ],
         ];
         if ($this->isCreate()) {
             $rules['code'][] = 'unique:role,code';
diff --git a/app/Model/DataPermission/Policy.php b/app/Model/DataPermission/Policy.php
index fdc818821..48e62a4cd 100644
--- a/app/Model/DataPermission/Policy.php
+++ b/app/Model/DataPermission/Policy.php
@@ -1,6 +1,14 @@
 <?php
 
 declare(strict_types=1);
+/**
+ * This file is part of MineAdmin.
+ *
+ * @link     https://www.mineadmin.com
+ * @document https://doc.mineadmin.com
+ * @contact  root@imoi.cn
+ * @license  https://github.com/mineadmin/MineAdmin/blob/master/LICENSE
+ */
 
 namespace App\Model\DataPermission;
 
@@ -10,11 +18,12 @@
 use Hyperf\DbConnection\Model\Model;
 
 /**
- * @property int $id 
+ * @property int $id
  * @property int $user_id 用户ID（与角色二选一）
  * @property int $role_id 角色ID（与用户二选一）
  * @property PolicyType $policy_type 策略类型（DEPT_SELF, DEPT_TREE, ALL, SELF, CUSTOM_DEPT, CUSTOM_FUNC）
  * @property bool $is_default 是否默认策略（默认值：true）
+ * @property array $value 策略值
  * @property Carbon $created_at
  * @property Carbon $updated_at
  * @property Carbon $deleted_at
@@ -22,6 +31,7 @@
 class Policy extends Model
 {
     use SoftDeletes;
+
     /**
      * The table associated with the model.
      */
@@ -30,7 +40,7 @@ class Policy extends Model
     /**
      * The attributes that are mass assignable.
      */
-    protected array $fillable = ['id', 'user_id', 'role_id', 'policy_type', 'is_default', 'created_at', 'updated_at', 'deleted_at'];
+    protected array $fillable = ['id', 'user_id', 'role_id', 'policy_type', 'is_default', 'created_at', 'updated_at', 'deleted_at', 'value'];
 
     /**
      * The attributes that should be cast to native types.
@@ -39,6 +49,6 @@ class Policy extends Model
         'id' => 'integer', 'user_id' => 'integer', 'role_id' => 'integer',
         'is_default' => 'bool', 'created_at' => 'datetime',
         'updated_at' => 'datetime', 'deleted_at' => 'datetime',
-        'policy_type' => PolicyType::class
+        'policy_type' => PolicyType::class, 'value' => 'array',
     ];
 }
diff --git a/app/Model/Enums/DataPermission/PolicyType.php b/app/Model/Enums/DataPermission/PolicyType.php
index cbaaffb99..167d3f93f 100644
--- a/app/Model/Enums/DataPermission/PolicyType.php
+++ b/app/Model/Enums/DataPermission/PolicyType.php
@@ -1,22 +1,27 @@
 <?php
 
+declare(strict_types=1);
+/**
+ * This file is part of MineAdmin.
+ *
+ * @link     https://www.mineadmin.com
+ * @document https://doc.mineadmin.com
+ * @contact  root@imoi.cn
+ * @license  https://github.com/mineadmin/MineAdmin/blob/master/LICENSE
+ */
+
 namespace App\Model\Enums\DataPermission;
 
 /**
- * 策略类型（DEPT_SELF, DEPT_TREE, ALL, SELF, CUSTOM_DEPT, CUSTOM_FUNC）
+ * 策略类型（DEPT_SELF, DEPT_TREE, ALL, SELF, CUSTOM_DEPT, CUSTOM_FUNC）.
  */
 enum PolicyType: string
 {
     case DeptSelf = 'DEPT_SELF';
-
     case DeptTree = 'DEPT_TREE';
-
     case All = 'ALL';
-
     case Self = 'SELF';
-
     case CustomDept = 'CUSTOM_DEPT';
-
     case CustomFunc = 'CUSTOM_FUNC';
 
     public function isDeptSelf(): bool
@@ -51,31 +56,31 @@ public function isCustomFunc(): bool
 
     public function isNotDeptSelf(): bool
     {
-        return !$this->isDeptSelf();
+        return ! $this->isDeptSelf();
     }
 
     public function isNotDeptTree(): bool
     {
-        return !$this->isDeptTree();
+        return ! $this->isDeptTree();
     }
 
     public function isNotAll(): bool
     {
-        return !$this->isAll();
+        return ! $this->isAll();
     }
 
     public function isNotSelf(): bool
     {
-        return !$this->isSelf();
+        return ! $this->isSelf();
     }
 
     public function isNotCustomDept(): bool
     {
-        return !$this->isCustomDept();
+        return ! $this->isCustomDept();
     }
 
     public function isNotCustomFunc(): bool
     {
-        return !$this->isCustomFunc();
+        return ! $this->isCustomFunc();
     }
 }
diff --git a/app/Model/Permission/Department.php b/app/Model/Permission/Department.php
index d42146a7f..e4ae3d4d3 100644
--- a/app/Model/Permission/Department.php
+++ b/app/Model/Permission/Department.php
@@ -1,6 +1,14 @@
 <?php
 
 declare(strict_types=1);
+/**
+ * This file is part of MineAdmin.
+ *
+ * @link     https://www.mineadmin.com
+ * @document https://doc.mineadmin.com
+ * @contact  root@imoi.cn
+ * @license  https://github.com/mineadmin/MineAdmin/blob/master/LICENSE
+ */
 
 namespace App\Model\Permission;
 
@@ -12,19 +20,20 @@
 use Hyperf\DbConnection\Model\Model;
 
 /**
- * @property int $id 
+ * @property int $id
  * @property string $name 部门名称
  * @property int $parent_id 父级部门ID
  * @property Carbon $created_at
  * @property Carbon $updated_at
  * @property Carbon $deleted_at
- * @property-read Position[]|Collection<int,Position> $positions 岗位
- * @property-read User[]|Collection<int,User> $department_users 部门用户
- * @property-read User[]|Collection<int,User> $leader 部门领导
+ * @property Collection<int,Position>|Position[] $positions 岗位
+ * @property Collection<int,User>|User[] $department_users 部门用户
+ * @property Collection<int,User>|User[] $leader 部门领导
  */
 class Department extends Model
 {
     use SoftDeletes;
+
     /**
      * The table associated with the model.
      */
@@ -54,5 +63,4 @@ public function leaders(): BelongsToMany
     {
         return $this->belongsToMany(User::class, 'user_leader', 'dept_id', 'user_id');
     }
-
 }
diff --git a/app/Model/Permission/Position.php b/app/Model/Permission/Position.php
index 3742b68ef..1f7d4e12a 100644
--- a/app/Model/Permission/Position.php
+++ b/app/Model/Permission/Position.php
@@ -1,29 +1,38 @@
 <?php
 
 declare(strict_types=1);
+/**
+ * This file is part of MineAdmin.
+ *
+ * @link     https://www.mineadmin.com
+ * @document https://doc.mineadmin.com
+ * @contact  root@imoi.cn
+ * @license  https://github.com/mineadmin/MineAdmin/blob/master/LICENSE
+ */
 
 namespace App\Model\Permission;
 
 use Carbon\Carbon;
+use Hyperf\Database\Model\Collection;
 use Hyperf\Database\Model\Relations\BelongsTo;
 use Hyperf\Database\Model\Relations\BelongsToMany;
 use Hyperf\Database\Model\SoftDeletes;
 use Hyperf\DbConnection\Model\Model;
-use Hyperf\Database\Model\Collection;
 
 /**
- * @property int $id 
+ * @property int $id
  * @property string $name 岗位名称
  * @property int $dept_id 部门ID
  * @property Carbon $created_at
  * @property Carbon $updated_at
  * @property Carbon $deleted_at
- * @property Department|null $department
- * @property-read User[]|Collection<int,User> $users
+ * @property null|Department $department
+ * @property Collection<int,User>|User[] $users
  */
 class Position extends Model
 {
     use SoftDeletes;
+
     /**
      * The table associated with the model.
      */
diff --git a/app/Model/Permission/Role.php b/app/Model/Permission/Role.php
index d0ad80364..852316258 100644
--- a/app/Model/Permission/Role.php
+++ b/app/Model/Permission/Role.php
@@ -35,7 +35,7 @@
  * @property string $remark 备注
  * @property Collection|Menu[] $menus
  * @property Collection|User[] $users
- * @property Policy|null $policy 数据权限策略
+ * @property null|Policy $policy 数据权限策略
  */
 final class Role extends MineModel
 {
@@ -94,7 +94,6 @@ public function deleting(Deleting $event)
         $this->menus()->detach();
     }
 
-
     public function policy(): BelongsTo
     {
         return $this->belongsTo(Policy::class, 'policy_id', 'id');
diff --git a/app/Model/Permission/User.php b/app/Model/Permission/User.php
index 215281271..0f301a672 100644
--- a/app/Model/Permission/User.php
+++ b/app/Model/Permission/User.php
@@ -43,7 +43,7 @@
  * @property string $remark 备注
  * @property null|Collection|Role[] $roles
  * @property mixed $password 密码
- * @property Policy|null $policy 数据权限策略
+ * @property null|Policy $policy 数据权限策略
  */
 final class User extends Model
 {
@@ -140,7 +140,6 @@ public function hasPermission(string $permission): bool
         return $this->roles()->whereRelation('menus', 'name', $permission)->exists();
     }
 
-
     public function policy(): BelongsTo
     {
         return $this->belongsTo(Policy::class, 'id', 'id');
diff --git a/app/Repository/Permission/RoleRepository.php b/app/Repository/Permission/RoleRepository.php
index da1a9be20..91d240802 100644
--- a/app/Repository/Permission/RoleRepository.php
+++ b/app/Repository/Permission/RoleRepository.php
@@ -25,14 +25,19 @@ public function __construct(
 
     public function handleSearch(Builder $query, array $params): Builder
     {
-        return $query->when(Arr::get($params, 'name'), static function (Builder $query, $name) {
-            $query->where('name', 'like', '%' . $name . '%');
-        })->when(Arr::get($params, 'code'), static function (Builder $query, $code) {
-            $query->whereIn('code', Arr::wrap($code));
-        })->when(Arr::has($params, 'status'), static function (Builder $query) use ($params) {
-            $query->where('status', $params['status']);
-        })->when(Arr::get($params, 'created_at'), static function (Builder $query, $createdAt) {
-            $query->whereBetween('created_at', $createdAt);
-        });
+        return $query
+            ->when(Arr::get($params, 'name'), static function (Builder $query, $name) {
+                $query->where('name', 'like', '%' . $name . '%');
+            })
+            ->when(Arr::get($params, 'code'), static function (Builder $query, $code) {
+                $query->whereIn('code', Arr::wrap($code));
+            })
+            ->when(Arr::has($params, 'status'), static function (Builder $query) use ($params) {
+                $query->where('status', $params['status']);
+            })
+            ->when(Arr::get($params, 'created_at'), static function (Builder $query, $createdAt) {
+                $query->whereBetween('created_at', $createdAt);
+            })
+            ->with(['policy']);
     }
 }
diff --git a/app/Schema/PolicySchema.php b/app/Schema/PolicySchema.php
new file mode 100644
index 000000000..f31abcd5a
--- /dev/null
+++ b/app/Schema/PolicySchema.php
@@ -0,0 +1,45 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * This file is part of MineAdmin.
+ *
+ * @link     https://www.mineadmin.com
+ * @document https://doc.mineadmin.com
+ * @contact  root@imoi.cn
+ * @license  https://github.com/mineadmin/MineAdmin/blob/master/LICENSE
+ */
+
+namespace App\Schema;
+
+use App\Model\DataPermission\Policy;
+use App\Model\Enums\DataPermission\PolicyType;
+use Hyperf\Swagger\Annotation\Property;
+use Hyperf\Swagger\Annotation\Schema;
+
+/**
+ * @see Policy
+ */
+#[Schema(title: 'PolicySchema')]
+class PolicySchema implements \JsonSerializable
+{
+    #[Property(property: 'policy_type', title: '策略类型', type: 'string')]
+    protected PolicyType $policyType;
+
+    #[Property(property: 'is_default', title: '是否默认策略', type: 'bool')]
+    protected bool $isDefault;
+
+    #[Property(property: 'value', title: '策略值', type: 'object')]
+    protected array $value;
+
+    public function __construct(Policy $model) {}
+
+    public function jsonSerialize(): mixed
+    {
+        return [
+            'policy_type' => $this->policyType->value,
+            'is_default' => $this->isDefault,
+            'value' => $this->value,
+        ];
+    }
+}
diff --git a/app/Schema/RoleSchema.php b/app/Schema/RoleSchema.php
index c1ce4bad3..98f7169a4 100644
--- a/app/Schema/RoleSchema.php
+++ b/app/Schema/RoleSchema.php
@@ -53,6 +53,9 @@ final class RoleSchema implements \JsonSerializable
     #[Property(property: 'remark', title: '备注', type: 'string')]
     public ?string $remark;
 
+    #[Property(property: 'policy', ref: '#/components/schemas/PolicySchema', title: '权限')]
+    public ?PolicySchema $policy;
+
     public function __construct(Role $model)
     {
         $this->id = $model->id;
@@ -66,10 +69,11 @@ public function __construct(Role $model)
         $this->createdAt = $model->created_at;
         $this->updatedAt = $model->updated_at->format(CarbonInterface::DEFAULT_TO_STRING_FORMAT);
         $this->remark = $model->remark;
+        $this->policy = isset($model->policy) ? new PolicySchema($model->policy) : null;
     }
 
     public function jsonSerialize(): mixed
     {
-        return ['id' => $this->id, 'name' => $this->name, 'code' => $this->code, 'data_scope' => $this->dataScope, 'status' => $this->status, 'sort' => $this->sort, 'created_by' => $this->createdBy, 'updated_by' => $this->updatedBy, 'created_at' => $this->createdAt, 'updated_at' => $this->updatedAt, 'remark' => $this->remark];
+        return ['id' => $this->id, 'name' => $this->name, 'code' => $this->code, 'data_scope' => $this->dataScope, 'status' => $this->status, 'sort' => $this->sort, 'created_by' => $this->createdBy, 'updated_by' => $this->updatedBy, 'created_at' => $this->createdAt, 'updated_at' => $this->updatedAt, 'remark' => $this->remark, 'policy' => $this->policy->jsonSerialize()];
     }
 }
diff --git a/app/Service/Permission/RoleService.php b/app/Service/Permission/RoleService.php
index fc92da29c..092693a29 100644
--- a/app/Service/Permission/RoleService.php
+++ b/app/Service/Permission/RoleService.php
@@ -12,11 +12,14 @@
 
 namespace App\Service\Permission;
 
+use App\Exception\BusinessException;
+use App\Http\Common\ResultCode;
 use App\Model\Permission\Role;
 use App\Repository\Permission\MenuRepository;
 use App\Repository\Permission\RoleRepository;
 use App\Service\IService;
 use Hyperf\Collection\Collection;
+use Hyperf\DbConnection\Db;
 
 /**
  * @extends IService<Role>
@@ -53,4 +56,34 @@ public function batchGrantPermissionsForRole(int $id, array $permissionsCode): v
                     ->toArray()
             );
     }
+
+    public function create(array $data): mixed
+    {
+        return Db::transaction(function () use ($data) {
+            /**
+             * @var Role $entity
+             */
+            $entity = parent::create($data);
+            if (isset($data['policy'])) {
+                $entity->policy()->create($data['policy']);
+            }
+        });
+    }
+
+    public function updateById(mixed $id, array $data): mixed
+    {
+        return Db::transaction(function () use ($id, $data) {
+            /**
+             * @var Role $entity
+             */
+            $entity = $this->repository->findById($id);
+            if (empty($entity)) {
+                throw new BusinessException(code: ResultCode::NOT_FOUND);
+            }
+            $entity->update($data);
+            if (isset($data['policy'])) {
+                $entity->policy()->update($data['policy']);
+            }
+        });
+    }
 }
diff --git a/databases/migrations/2025_02_24_195620_create_department_tables.php b/databases/migrations/2025_02_24_195620_create_department_tables.php
index 00eefdd73..236c9346c 100644
--- a/databases/migrations/2025_02_24_195620_create_department_tables.php
+++ b/databases/migrations/2025_02_24_195620_create_department_tables.php
@@ -55,13 +55,7 @@ public function up(): void
             $table->bigInteger('role_id')->default(0)->comment('角色ID（与用户二选一）');
             $table->string('policy_type', 20)->comment('策略类型（DEPT_SELF, DEPT_TREE, ALL, SELF, CUSTOM_DEPT, CUSTOM_FUNC）');
             $table->boolean('is_default')->default(true)->comment('是否默认策略（默认值：true）');
-            $table->datetimes();
-            $table->softDeletes();
-        });
-        Schema::create('data_permission_custom_func', function (Blueprint $table) {
-            $table->comment('自定义回调函数表');
-            $table->bigInteger('policy_id')->comment('数据权限策略ID');
-            $table->string('func_key', 50)->comment('回调函数KEY');
+            $table->json('value')->nullable()->comment('策略值');
             $table->datetimes();
             $table->softDeletes();
         });

From 7a4d7c1d431190ae0d95011750ae03c27f00a106 Mon Sep 17 00:00:00 2001
From: zds <49744633+zds-s@users.noreply.github.com>
Date: Thu, 6 Mar 2025 00:27:15 +0800
Subject: [PATCH 06/91] feat: enhance user management with policy handling in
 requests and services

---
 .../Admin/Request/Permission/RoleRequest.php  |  4 +--
 .../Admin/Request/Permission/UserRequest.php  | 20 +++++++++++++
 app/Repository/Permission/UserRepository.php  |  3 +-
 app/Schema/UserSchema.php                     |  4 +++
 app/Service/Permission/UserService.php        | 29 +++++++++++++++++++
 5 files changed, 57 insertions(+), 3 deletions(-)

diff --git a/app/Http/Admin/Request/Permission/RoleRequest.php b/app/Http/Admin/Request/Permission/RoleRequest.php
index b1188d2e9..3e8ae9e7f 100644
--- a/app/Http/Admin/Request/Permission/RoleRequest.php
+++ b/app/Http/Admin/Request/Permission/RoleRequest.php
@@ -51,12 +51,12 @@ public function rules(): array
                 Rule::enum(PolicyType::class),
             ],
             'policy.*.value' => [
-                'required_with:policy',
+                'sometimes',
                 'array',
                 'min:1',
             ],
             'policy.*.is_default' => [
-                'required_with:policy',
+                'sometimes',
                 'integer',
                 'in:0,1',
             ],
diff --git a/app/Http/Admin/Request/Permission/UserRequest.php b/app/Http/Admin/Request/Permission/UserRequest.php
index 33c1af077..201332ce8 100644
--- a/app/Http/Admin/Request/Permission/UserRequest.php
+++ b/app/Http/Admin/Request/Permission/UserRequest.php
@@ -13,8 +13,10 @@
 namespace App\Http\Admin\Request\Permission;
 
 use App\Http\Common\Request\Traits\NoAuthorizeTrait;
+use App\Model\Enums\DataPermission\PolicyType;
 use App\Schema\UserSchema;
 use Hyperf\Validation\Request\FormRequest;
+use Hyperf\Validation\Rule;
 use Mine\Swagger\Attributes\FormRequest as FormRequestAnnotation;
 
 #[FormRequestAnnotation(
@@ -43,6 +45,7 @@
         'status',
         'backend_setting',
         'remark',
+        'policy',
     ]
 )]
 class UserRequest extends FormRequest
@@ -62,6 +65,23 @@ public function rules(): array
             'status' => 'sometimes|integer',
             'backend_setting' => 'sometimes|array|max:255',
             'remark' => 'sometimes|string|max:255',
+            'policy' => 'sometimes|array',
+            'policy.*.policy_type' => [
+                'required_with:policy',
+                'string',
+                'max:10',
+                Rule::enum(PolicyType::class),
+            ],
+            'policy.*.value' => [
+                'sometimes',
+                'array',
+                'min:1',
+            ],
+            'policy.*.is_default' => [
+                'sometimes',
+                'integer',
+                'in:0,1',
+            ],
         ];
     }
 
diff --git a/app/Repository/Permission/UserRepository.php b/app/Repository/Permission/UserRepository.php
index 000858318..ce37714ea 100644
--- a/app/Repository/Permission/UserRepository.php
+++ b/app/Repository/Permission/UserRepository.php
@@ -72,6 +72,7 @@ public function handleSearch(Builder $query, array $params): Builder
                 $query->whereHas('roles', static function (Builder $query) use ($roleId) {
                     $query->where('role_id', $roleId);
                 });
-            });
+            })
+            ->with(['policy']);
     }
 }
diff --git a/app/Schema/UserSchema.php b/app/Schema/UserSchema.php
index c51e59385..1e5e00aad 100644
--- a/app/Schema/UserSchema.php
+++ b/app/Schema/UserSchema.php
@@ -72,6 +72,9 @@ final class UserSchema implements \JsonSerializable
     #[Property(property: 'remark', title: '备注', type: 'string')]
     public ?string $remark;
 
+    #[Property(property: 'policy', ref: '#/components/schemas/PolicySchema', title: '权限')]
+    public ?PolicySchema $policy;
+
     public function __construct(User $model)
     {
         $this->id = $model->id;
@@ -91,6 +94,7 @@ public function __construct(User $model)
         $this->createdAt = $model->created_at;
         $this->updatedAt = $model->updated_at;
         $this->remark = $model->remark;
+        $this->policy = isset($model->policy) ? new PolicySchema($model->policy) : null;
     }
 
     public function jsonSerialize(): mixed
diff --git a/app/Service/Permission/UserService.php b/app/Service/Permission/UserService.php
index 211c3cb1d..cd345f5ee 100644
--- a/app/Service/Permission/UserService.php
+++ b/app/Service/Permission/UserService.php
@@ -12,12 +12,15 @@
 
 namespace App\Service\Permission;
 
+use App\Exception\BusinessException;
+use App\Http\Common\ResultCode;
 use App\Model\Permission\Role;
 use App\Model\Permission\User;
 use App\Repository\Permission\RoleRepository;
 use App\Repository\Permission\UserRepository;
 use App\Service\IService;
 use Hyperf\Collection\Collection;
+use Hyperf\DbConnection\Db;
 
 /**
  * @extends IService<User>
@@ -69,4 +72,30 @@ public function batchGrantRoleForUser(int $id, array $roleCodes): void
                 })
             );
     }
+
+    public function create(array $data): mixed
+    {
+        return Db::transaction(function () use ($data) {
+            /** @var User $entity */
+            $entity = parent::create($data);
+            if (! empty($data['policy'])) {
+                $entity->policy()->create($data['policy']);
+            }
+        });
+    }
+
+    public function updateById(mixed $id, array $data): mixed
+    {
+        return Db::transaction(function () use ($id, $data) {
+            /** @var User $entity */
+            $entity = $this->repository->findById($id);
+            if (empty($entity)) {
+                throw new BusinessException(ResultCode::NOT_FOUND);
+            }
+            $entity->fill($data)->save();
+            if (! empty($data['policy'])) {
+                $entity->policy()->update($data['policy']);
+            }
+        });
+    }
 }

From dc92609e582177d075d73c118e87bb0693e84893 Mon Sep 17 00:00:00 2001
From: zds <49744633+zds-s@users.noreply.github.com>
Date: Thu, 6 Mar 2025 00:27:56 +0800
Subject: [PATCH 07/91] feat: ensure policy deletion on role and user removal

---
 app/Model/Permission/Role.php | 1 +
 app/Model/Permission/User.php | 1 +
 2 files changed, 2 insertions(+)

diff --git a/app/Model/Permission/Role.php b/app/Model/Permission/Role.php
index 852316258..ed2d207dc 100644
--- a/app/Model/Permission/Role.php
+++ b/app/Model/Permission/Role.php
@@ -92,6 +92,7 @@ public function deleting(Deleting $event)
     {
         $this->users()->detach();
         $this->menus()->detach();
+        $this->policy()->delete();
     }
 
     public function policy(): BelongsTo
diff --git a/app/Model/Permission/User.php b/app/Model/Permission/User.php
index 0f301a672..14c40b61c 100644
--- a/app/Model/Permission/User.php
+++ b/app/Model/Permission/User.php
@@ -90,6 +90,7 @@ public function roles(): BelongsToMany
     public function deleted(Deleted $event)
     {
         $this->roles()->detach();
+        $this->policy()->delete();
     }
 
     public function setPasswordAttribute($value): void

From 8befc9cf3bfd02286c1b64dfb114178483c6b570 Mon Sep 17 00:00:00 2001
From: zds <49744633+zds-s@users.noreply.github.com>
Date: Thu, 6 Mar 2025 01:04:27 +0800
Subject: [PATCH 08/91] feat: add Department management functionality with
 controller, service, repository, request, and schema

---
 .../Permission/DepartmentController.php       | 121 ++++++++++++++++++
 .../Request/Permission/DepartmentRequest.php  |  64 +++++++++
 .../Permission/DepartmentRepository.php       |  52 ++++++++
 app/Schema/DepartmentSchema.php               |  59 +++++++++
 app/Service/Permission/DepartmentService.php  |  27 ++++
 ..._02_24_195620_create_department_tables.php |  50 +++++++-
 6 files changed, 372 insertions(+), 1 deletion(-)
 create mode 100644 app/Http/Admin/Controller/Permission/DepartmentController.php
 create mode 100644 app/Http/Admin/Request/Permission/DepartmentRequest.php
 create mode 100644 app/Repository/Permission/DepartmentRepository.php
 create mode 100644 app/Schema/DepartmentSchema.php
 create mode 100644 app/Service/Permission/DepartmentService.php

diff --git a/app/Http/Admin/Controller/Permission/DepartmentController.php b/app/Http/Admin/Controller/Permission/DepartmentController.php
new file mode 100644
index 000000000..b4eb40480
--- /dev/null
+++ b/app/Http/Admin/Controller/Permission/DepartmentController.php
@@ -0,0 +1,121 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * This file is part of MineAdmin.
+ *
+ * @link     https://www.mineadmin.com
+ * @document https://doc.mineadmin.com
+ * @contact  root@imoi.cn
+ * @license  https://github.com/mineadmin/MineAdmin/blob/master/LICENSE
+ */
+
+namespace App\Http\Admin\Controller\Permission;
+
+use App\Http\Admin\Controller\AbstractController;
+use App\Http\Admin\Middleware\PermissionMiddleware;
+use App\Http\Admin\Request\Permission\DepartmentRequest;
+use App\Http\Common\Middleware\AccessTokenMiddleware;
+use App\Http\Common\Middleware\OperationMiddleware;
+use App\Http\Common\Result;
+use App\Http\CurrentUser;
+use App\Schema\DepartmentSchema;
+use App\Service\Permission\DepartmentService;
+use Hyperf\HttpServer\Annotation\Middleware;
+use Hyperf\Swagger\Annotation\Delete;
+use Hyperf\Swagger\Annotation\Get;
+use Hyperf\Swagger\Annotation\HyperfServer;
+use Hyperf\Swagger\Annotation\JsonContent;
+use Hyperf\Swagger\Annotation\Post;
+use Hyperf\Swagger\Annotation\Put;
+use Hyperf\Swagger\Annotation\RequestBody;
+use Mine\Access\Attribute\Permission;
+use Mine\Swagger\Attributes\PageResponse;
+use Mine\Swagger\Attributes\ResultResponse;
+
+#[HyperfServer(name: 'http')]
+#[Middleware(middleware: AccessTokenMiddleware::class, priority: 100)]
+#[Middleware(middleware: PermissionMiddleware::class, priority: 99)]
+#[Middleware(middleware: OperationMiddleware::class, priority: 98)]
+class DepartmentController extends AbstractController
+{
+    public function __construct(
+        protected readonly CurrentUser $currentUser,
+        protected readonly DepartmentService $service
+    ) {}
+
+    #[Get(
+        path: '/admin/department/list',
+        operationId: 'roleList',
+        summary: '岗位列表',
+        security: [['Bearer' => [], 'ApiKey' => []]],
+        tags: ['岗位管理'],
+    )]
+    #[PageResponse(instance: DepartmentSchema::class)]
+    #[Permission(code: 'permission:department:index')]
+    public function pageList(): Result
+    {
+        return $this->success(
+            $this->service->page(
+                $this->getRequestData(),
+                $this->getCurrentPage(),
+                $this->getPageSize()
+            )
+        );
+    }
+
+    #[Post(
+        path: '/admin/department',
+        operationId: 'roleCreate',
+        summary: '创建岗位',
+        security: [['Bearer' => [], 'ApiKey' => []]],
+        tags: ['岗位管理'],
+    )]
+    #[RequestBody(
+        content: new JsonContent(ref: DepartmentRequest::class)
+    )]
+    #[Permission(code: 'permission:department:save')]
+    #[ResultResponse(instance: new Result())]
+    public function create(DepartmentRequest $request): Result
+    {
+        $this->service->create(array_merge($request->validated(), [
+            'created_by' => $this->currentUser->id(),
+        ]));
+        return $this->success();
+    }
+
+    #[Put(
+        path: '/admin/department/{id}',
+        operationId: 'roleSave',
+        summary: '保存岗位',
+        security: [['Bearer' => [], 'ApiKey' => []]],
+        tags: ['岗位管理'],
+    )]
+    #[RequestBody(
+        content: new JsonContent(ref: DepartmentRequest::class)
+    )]
+    #[Permission(code: 'permission:department:update')]
+    #[ResultResponse(instance: new Result())]
+    public function save(int $id, DepartmentRequest $request): Result
+    {
+        $this->service->updateById($id, array_merge($request->validated(), [
+            'updated_by' => $this->currentUser->id(),
+        ]));
+        return $this->success();
+    }
+
+    #[Delete(
+        path: '/admin/department',
+        operationId: 'roleDelete',
+        summary: '删除岗位',
+        security: [['Bearer' => [], 'ApiKey' => []]],
+        tags: ['岗位管理'],
+    )]
+    #[ResultResponse(instance: new Result())]
+    #[Permission(code: 'permission:department:delete')]
+    public function delete(): Result
+    {
+        $this->service->deleteById($this->getRequestData());
+        return $this->success();
+    }
+}
diff --git a/app/Http/Admin/Request/Permission/DepartmentRequest.php b/app/Http/Admin/Request/Permission/DepartmentRequest.php
new file mode 100644
index 000000000..e50b983ca
--- /dev/null
+++ b/app/Http/Admin/Request/Permission/DepartmentRequest.php
@@ -0,0 +1,64 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * This file is part of MineAdmin.
+ *
+ * @link     https://www.mineadmin.com
+ * @document https://doc.mineadmin.com
+ * @contact  root@imoi.cn
+ * @license  https://github.com/mineadmin/MineAdmin/blob/master/LICENSE
+ */
+
+namespace App\Http\Admin\Request\Permission;
+
+use App\Http\Common\Request\Traits\HttpMethodTrait;
+use App\Http\Common\Request\Traits\NoAuthorizeTrait;
+use App\Schema\DepartmentSchema;
+use Hyperf\Validation\Request\FormRequest;
+
+#[\Mine\Swagger\Attributes\FormRequest(
+    schema: DepartmentSchema::class,
+    only: [
+        'name', 'parent_id',
+    ]
+)]
+class DepartmentRequest extends FormRequest
+{
+    use HttpMethodTrait;
+    use NoAuthorizeTrait;
+
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    public function rules(): array
+    {
+        $rules = [
+            'name' => 'required|string|max:60',
+            'parent_id' => 'sometimes|integer',
+        ];
+        if ($this->isCreate()) {
+            $rules['name'] = 'required|string|max:60|unique:department,name';
+        }
+        if ($this->isUpdate()) {
+            $rules['name'] = 'required|string|max:60|unique:department,name,' . $this->route('id');
+        }
+        $rules['positions'] = 'sometimes|array';
+        $rules['positions.*.id'] = 'sometimes|integer';
+        $rules['department_users'] = 'sometimes|array';
+        $rules['department_users.*.id'] = 'sometimes|integer';
+        $rules['leader'] = 'sometimes|array';
+        $rules['leader.*.id'] = 'sometimes|integer';
+        return $rules;
+    }
+
+    public function attributes(): array
+    {
+        return [
+            'name' => '部门名称',
+            'parent_id' => '上级部门',
+        ];
+    }
+}
diff --git a/app/Repository/Permission/DepartmentRepository.php b/app/Repository/Permission/DepartmentRepository.php
new file mode 100644
index 000000000..ee4ddb875
--- /dev/null
+++ b/app/Repository/Permission/DepartmentRepository.php
@@ -0,0 +1,52 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * This file is part of MineAdmin.
+ *
+ * @link     https://www.mineadmin.com
+ * @document https://doc.mineadmin.com
+ * @contact  root@imoi.cn
+ * @license  https://github.com/mineadmin/MineAdmin/blob/master/LICENSE
+ */
+
+namespace App\Repository\Permission;
+
+use App\Model\Permission\Department;
+use App\Repository\IRepository;
+use Hyperf\Database\Model\Builder;
+
+/**
+ * @extends IRepository<Department>
+ */
+final class DepartmentRepository extends IRepository
+{
+    public function __construct(
+        protected readonly Department $model
+    ) {}
+
+    public function handleSearch(Builder $query, array $params): Builder
+    {
+        return $query
+            ->when(isset($params['name']), static function (Builder $query) use ($params) {
+                $query->where('name', 'like', '%' . $params['name'] . '%');
+            })
+            ->when(isset($params['parent_id']), static function (Builder $query) use ($params) {
+                $query->where('parent_id', $params['parent_id']);
+            })
+            ->when(isset($params['created_at']), static function (Builder $query) use ($params) {
+                $query->whereBetween('created_at', $params['created_at']);
+            })
+            ->when(isset($params['updated_at']), static function (Builder $query) use ($params) {
+                $query->whereBetween('updated_at', $params['updated_at']);
+            })
+            ->when(isset($params['level']), static function (Builder $query) use ($params) {
+                if ($params['level'] === 1) {
+                    $query->where('parent_id', 0);
+                }
+
+                // todo 指定层级查询
+            })
+            ->with(['positions', 'department_users:id,nickname,username,avatar', 'leader:id,nickname,username,avatar']);
+    }
+}
diff --git a/app/Schema/DepartmentSchema.php b/app/Schema/DepartmentSchema.php
new file mode 100644
index 000000000..d8dffd557
--- /dev/null
+++ b/app/Schema/DepartmentSchema.php
@@ -0,0 +1,59 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * This file is part of MineAdmin.
+ *
+ * @link     https://www.mineadmin.com
+ * @document https://doc.mineadmin.com
+ * @contact  root@imoi.cn
+ * @license  https://github.com/mineadmin/MineAdmin/blob/master/LICENSE
+ */
+
+namespace App\Schema;
+
+use Hyperf\Swagger\Annotation\Items;
+use Hyperf\Swagger\Annotation\Property;
+use Hyperf\Swagger\Annotation\Schema;
+
+#[Schema(title: 'DepartmentSchema', description: '部门模型')]
+class DepartmentSchema implements \JsonSerializable
+{
+    #[Property(property: 'id', title: '主键', type: 'int')]
+    public ?int $id;
+
+    #[Property(property: 'parent_id', title: '父ID', type: 'int')]
+    public ?int $parentId;
+
+    #[Property(property: 'name', title: '部门名称', type: 'string')]
+    public ?string $name;
+
+    #[Property(property: 'created_by', title: '创建者', type: 'int')]
+    public ?int $createdBy;
+
+    #[Property(property: 'updated_by', title: '更新者', type: 'int')]
+    public ?int $updatedBy;
+
+    #[Property(property: 'created_at', title: '', type: 'string')]
+    public mixed $createdAt;
+
+    #[Property(property: 'updated_at', title: '', type: 'string')]
+    public mixed $updatedAt;
+
+    #[Property(property: 'remark', title: '备注', type: 'string')]
+    public ?string $remark;
+
+    #[Property(property: 'positions', title: '职位', type: 'array')]
+    public ?array $positions;
+
+    #[Property(property: 'department_users', title: '部门用户', type: 'array', items: new Items(ref: '#/components/schemas/UserSchema'))]
+    public ?array $departmentUsers;
+
+    #[Property(property: 'leader', title: '领导', type: 'array', items: new Items(ref: '#/components/schemas/UserSchema'))]
+    public ?array $leader;
+
+    public function jsonSerialize(): mixed
+    {
+        return [];
+    }
+}
diff --git a/app/Service/Permission/DepartmentService.php b/app/Service/Permission/DepartmentService.php
new file mode 100644
index 000000000..62f8ce358
--- /dev/null
+++ b/app/Service/Permission/DepartmentService.php
@@ -0,0 +1,27 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * This file is part of MineAdmin.
+ *
+ * @link     https://www.mineadmin.com
+ * @document https://doc.mineadmin.com
+ * @contact  root@imoi.cn
+ * @license  https://github.com/mineadmin/MineAdmin/blob/master/LICENSE
+ */
+
+namespace App\Service\Permission;
+
+use App\Model\Permission\Department;
+use App\Repository\Permission\DepartmentRepository;
+use App\Service\IService;
+
+/**
+ * @extends IService<Department>
+ */
+class DepartmentService extends IService
+{
+    public function __construct(
+        protected readonly DepartmentRepository $repository
+    ) {}
+}
diff --git a/databases/migrations/2025_02_24_195620_create_department_tables.php b/databases/migrations/2025_02_24_195620_create_department_tables.php
index 236c9346c..1ea76d03b 100644
--- a/databases/migrations/2025_02_24_195620_create_department_tables.php
+++ b/databases/migrations/2025_02_24_195620_create_department_tables.php
@@ -1,5 +1,6 @@
 <?php
 
+use App\Model\Permission\Menu;
 use Hyperf\Database\Schema\Schema;
 use Hyperf\Database\Schema\Blueprint;
 use Hyperf\Database\Migrations\Migration;
@@ -11,6 +12,12 @@
      */
     public function up(): void
     {
+        Schema::dropIfExists('department');
+        Schema::dropIfExists('position');
+        Schema::dropIfExists('user_dept');
+        Schema::dropIfExists('user_position');
+        Schema::dropIfExists('dept_leader');
+        Schema::dropIfExists('data_permission_policy');
         Schema::create('department', function (Blueprint $table) {
             $table->comment('部门表');
             $table->bigIncrements('id');
@@ -59,6 +66,48 @@ public function up(): void
             $table->datetimes();
             $table->softDeletes();
         });
+        $parent = Menu::where('name','permission')->firstOrFail();
+        $now = Menu::create([
+            'name'  =>  'permission:department',
+            'path'  =>  '/permission/departments',
+            'parent_id' => $parent->id,
+            'meta'  =>  [
+                'title' => '部门管理',
+                'icon' => 'ri:git-repository-private-line',
+                'type' => 'M',
+                'hidden' => 0,
+                'componentPath' => 'modules/',
+                'componentSuffix' => '.vue',
+                'breadcrumbEnable' => 1,
+                'copyright' => 1,
+                'cache' => 1,
+                'affix' => 0,
+            ]
+        ]);
+        $children = [
+            'permission:department:index' => '部门列表',
+            'permission:department:save'    =>  '部门新增',
+            'permission:department:update'  =>  '部门编辑',
+            'permission:department:delete'  =>  '部门删除',
+        ];
+        foreach ($children as $child => $title) {
+            Menu::create([
+                'name'  =>  $child,
+                'path'  =>  '/permission/departments',
+                'meta'  =>  [
+                    'title' => $title,
+                    'icon' => 'ri:git-repository-private-line',
+                    'type' => 'M',
+                    'hidden' => 1,
+                    'componentPath' => 'modules/',
+                    'componentSuffix' => '.vue',
+                    'breadcrumbEnable' => 1,
+                    'cache' => 1,
+                    'affix' => 0,
+                ],
+                'parent_id' => $now->id
+            ]);
+        }
     }
 
     /**
@@ -72,6 +121,5 @@ public function down(): void
         Schema::dropIfExists('user_position');
         Schema::dropIfExists('dept_leader');
         Schema::dropIfExists('data_permission_policy');
-        Schema::dropIfExists('data_permission_custom_func');
     }
 };

From 7372b18b5e0302377f415a209788dc4bd28765b1 Mon Sep 17 00:00:00 2001
From: "X.Mo" <root@imoi.cn>
Date: Mon, 10 Mar 2025 10:40:29 +0800
Subject: [PATCH 09/91] =?UTF-8?q?fix:(data=20seeder)=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=A1=AB=E5=85=85=E9=83=A8=E9=97=A8=E8=8F=9C=E5=8D=95=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AEbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ..._02_24_195620_create_department_tables.php | 43 ------------
 databases/seeders/user_dept_20250310.php      | 66 +++++++++++++++++++
 2 files changed, 66 insertions(+), 43 deletions(-)
 create mode 100644 databases/seeders/user_dept_20250310.php

diff --git a/databases/migrations/2025_02_24_195620_create_department_tables.php b/databases/migrations/2025_02_24_195620_create_department_tables.php
index 1ea76d03b..2f9477ddb 100644
--- a/databases/migrations/2025_02_24_195620_create_department_tables.php
+++ b/databases/migrations/2025_02_24_195620_create_department_tables.php
@@ -1,6 +1,5 @@
 <?php
 
-use App\Model\Permission\Menu;
 use Hyperf\Database\Schema\Schema;
 use Hyperf\Database\Schema\Blueprint;
 use Hyperf\Database\Migrations\Migration;
@@ -66,48 +65,6 @@ public function up(): void
             $table->datetimes();
             $table->softDeletes();
         });
-        $parent = Menu::where('name','permission')->firstOrFail();
-        $now = Menu::create([
-            'name'  =>  'permission:department',
-            'path'  =>  '/permission/departments',
-            'parent_id' => $parent->id,
-            'meta'  =>  [
-                'title' => '部门管理',
-                'icon' => 'ri:git-repository-private-line',
-                'type' => 'M',
-                'hidden' => 0,
-                'componentPath' => 'modules/',
-                'componentSuffix' => '.vue',
-                'breadcrumbEnable' => 1,
-                'copyright' => 1,
-                'cache' => 1,
-                'affix' => 0,
-            ]
-        ]);
-        $children = [
-            'permission:department:index' => '部门列表',
-            'permission:department:save'    =>  '部门新增',
-            'permission:department:update'  =>  '部门编辑',
-            'permission:department:delete'  =>  '部门删除',
-        ];
-        foreach ($children as $child => $title) {
-            Menu::create([
-                'name'  =>  $child,
-                'path'  =>  '/permission/departments',
-                'meta'  =>  [
-                    'title' => $title,
-                    'icon' => 'ri:git-repository-private-line',
-                    'type' => 'M',
-                    'hidden' => 1,
-                    'componentPath' => 'modules/',
-                    'componentSuffix' => '.vue',
-                    'breadcrumbEnable' => 1,
-                    'cache' => 1,
-                    'affix' => 0,
-                ],
-                'parent_id' => $now->id
-            ]);
-        }
     }
 
     /**
diff --git a/databases/seeders/user_dept_20250310.php b/databases/seeders/user_dept_20250310.php
new file mode 100644
index 000000000..f5d475e23
--- /dev/null
+++ b/databases/seeders/user_dept_20250310.php
@@ -0,0 +1,66 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * This file is part of MineAdmin.
+ *
+ * @link     https://www.mineadmin.com
+ * @document https://doc.mineadmin.com
+ * @contact  root@imoi.cn
+ * @license  https://github.com/mineadmin/MineAdmin/blob/master/LICENSE
+ */
+
+use App\Model\Permission\Menu;
+use Hyperf\Database\Seeders\Seeder;
+
+class UserDept20250310 extends Seeder
+{
+    /**
+     * Run the database seeds.
+     */
+    public function run()
+    {
+        $parent = Menu::where('name','permission')->firstOrFail();
+        $now = Menu::create([
+            'name'  =>  'permission:department',
+            'path'  =>  '/permission/departments',
+            'parent_id' => $parent->id,
+            'meta'  =>  [
+                'title' => '部门管理',
+                'icon' => 'ri:git-repository-private-line',
+                'type' => 'M',
+                'hidden' => 0,
+                'componentPath' => 'modules/',
+                'componentSuffix' => '.vue',
+                'breadcrumbEnable' => 1,
+                'copyright' => 1,
+                'cache' => 1,
+                'affix' => 0,
+            ]
+        ]);
+        $children = [
+            'permission:department:index' => '部门列表',
+            'permission:department:save'    =>  '部门新增',
+            'permission:department:update'  =>  '部门编辑',
+            'permission:department:delete'  =>  '部门删除',
+        ];
+        foreach ($children as $child => $title) {
+            Menu::create([
+                'name'  =>  $child,
+                'path'  =>  '/permission/departments',
+                'meta'  =>  [
+                    'title' => $title,
+                    'icon' => 'ri:git-repository-private-line',
+                    'type' => 'M',
+                    'hidden' => 1,
+                    'componentPath' => 'modules/',
+                    'componentSuffix' => '.vue',
+                    'breadcrumbEnable' => 1,
+                    'cache' => 1,
+                    'affix' => 0,
+                ],
+                'parent_id' => $now->id
+            ]);
+        }
+    }
+}

From d895cc55414947db6509845e22632cd9e96531de Mon Sep 17 00:00:00 2001
From: "X.Mo" <root@imoi.cn>
Date: Mon, 10 Mar 2025 15:10:51 +0800
Subject: [PATCH 10/91] =?UTF-8?q?feat:=20=E9=83=A8=E9=97=A8=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=89=8D=E7=AB=AF=E9=A1=B5=E9=9D=A2.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Model/Permission/Department.php           |   4 +-
 databases/seeders/user_dept_20250310.php      |  27 ++-
 web/src/modules/base/api/department.ts        |  36 ++++
 ...344\275\223\344\270\255\346\226\207].yaml" |  17 ++
 .../department/data/getFormItems.tsx          |  46 ++++
 .../department/data/getSearchItems.tsx        |  21 ++
 .../department/data/getTableColumns.tsx       |  87 ++++++++
 .../base/views/permission/department/form.vue |  76 +++++++
 .../views/permission/department/index.vue     | 197 ++++++++++++++++++
 .../views/permission/department/setLeader.vue | 111 ++++++++++
 .../base/views/permission/menu/index.vue      |   3 +-
 web/types/components.d.ts                     |   3 +
 12 files changed, 615 insertions(+), 13 deletions(-)
 create mode 100644 web/src/modules/base/api/department.ts
 create mode 100644 web/src/modules/base/views/permission/department/data/getFormItems.tsx
 create mode 100644 web/src/modules/base/views/permission/department/data/getSearchItems.tsx
 create mode 100644 web/src/modules/base/views/permission/department/data/getTableColumns.tsx
 create mode 100644 web/src/modules/base/views/permission/department/form.vue
 create mode 100644 web/src/modules/base/views/permission/department/index.vue
 create mode 100644 web/src/modules/base/views/permission/department/setLeader.vue

diff --git a/app/Model/Permission/Department.php b/app/Model/Permission/Department.php
index e4ae3d4d3..4bbc3bb3f 100644
--- a/app/Model/Permission/Department.php
+++ b/app/Model/Permission/Department.php
@@ -59,8 +59,8 @@ public function department_users(): BelongsToMany
         return $this->belongsToMany(User::class, 'user_dept', 'dept_id', 'user_id');
     }
 
-    public function leaders(): BelongsToMany
+    public function leader(): BelongsToMany
     {
-        return $this->belongsToMany(User::class, 'user_leader', 'dept_id', 'user_id');
+        return $this->belongsToMany(User::class, 'dept_leader', 'dept_id', 'user_id');
     }
 }
diff --git a/databases/seeders/user_dept_20250310.php b/databases/seeders/user_dept_20250310.php
index f5d475e23..d233e8c94 100644
--- a/databases/seeders/user_dept_20250310.php
+++ b/databases/seeders/user_dept_20250310.php
@@ -25,9 +25,11 @@ public function run()
             'name'  =>  'permission:department',
             'path'  =>  '/permission/departments',
             'parent_id' => $parent->id,
+            'component' => 'base/views/permission/department/index',
             'meta'  =>  [
                 'title' => '部门管理',
-                'icon' => 'ri:git-repository-private-line',
+                'icon' => 'mingcute:department-line',
+                'i18n' => 'baseMenu.permission.department',
                 'type' => 'M',
                 'hidden' => 0,
                 'componentPath' => 'modules/',
@@ -39,28 +41,33 @@ public function run()
             ]
         ]);
         $children = [
-            'permission:department:index' => '部门列表',
-            'permission:department:save'    =>  '部门新增',
-            'permission:department:update'  =>  '部门编辑',
-            'permission:department:delete'  =>  '部门删除',
+            'permission:department:index'  => '部门列表',
+            'permission:department:save'   =>  '部门新增',
+            'permission:department:update' =>  '部门编辑',
+            'permission:department:delete' =>  '部门删除',
         ];
+        $i18n = [
+            'baseMenu.permission.departmentList',
+            'baseMenu.permission.departmentCreate',
+            'baseMenu.permission.departmentSave',
+            'baseMenu.permission.departmentDelete',
+        ];
+        $i = 0;
         foreach ($children as $child => $title) {
             Menu::create([
                 'name'  =>  $child,
                 'path'  =>  '/permission/departments',
                 'meta'  =>  [
                     'title' => $title,
-                    'icon' => 'ri:git-repository-private-line',
-                    'type' => 'M',
+                    'type' => 'B',
+                    'i18n' => $i18n[$i],
                     'hidden' => 1,
-                    'componentPath' => 'modules/',
-                    'componentSuffix' => '.vue',
-                    'breadcrumbEnable' => 1,
                     'cache' => 1,
                     'affix' => 0,
                 ],
                 'parent_id' => $now->id
             ]);
+            $i++;
         }
     }
 }
diff --git a/web/src/modules/base/api/department.ts b/web/src/modules/base/api/department.ts
new file mode 100644
index 000000000..b16af828f
--- /dev/null
+++ b/web/src/modules/base/api/department.ts
@@ -0,0 +1,36 @@
+/**
+ * MineAdmin is committed to providing solutions for quickly building web applications
+ * Please view the LICENSE file that was distributed with this source code,
+ * For the full copyright and license information.
+ * Thank you very much for using MineAdmin.
+ *
+ * @Author X.Mo<root@imoi.cn>
+ * @Link   https://github.com/mineadmin
+ */
+import type { PageList, ResponseStruct } from '#/global'
+
+export interface DepartmentVo {
+  id?: number
+  name?: string
+}
+
+export interface DepartmentSearchVo {
+  name?: string
+  [key: string]: any
+}
+
+export function page(data: DepartmentSearchVo): Promise<ResponseStruct<PageList<DepartmentVo>>> {
+  return useHttp().get('/admin/department/list', { params: data })
+}
+
+export function create(data: DepartmentVo): Promise<ResponseStruct<null>> {
+  return useHttp().post('/admin/department', data)
+}
+
+export function save(id: number, data: DepartmentVo): Promise<ResponseStruct<null>> {
+  return useHttp().put(`/admin/department/${id}`, data)
+}
+
+export function deleteByIds(ids: number[]): Promise<ResponseStruct<null>> {
+  return useHttp().delete('/admin/department', { data: ids })
+}
diff --git "a/web/src/modules/base/locales/zh_CN[\347\256\200\344\275\223\344\270\255\346\226\207].yaml" "b/web/src/modules/base/locales/zh_CN[\347\256\200\344\275\223\344\270\255\346\226\207].yaml"
index b5698cf03..156329d82 100644
--- "a/web/src/modules/base/locales/zh_CN[\347\256\200\344\275\223\344\270\255\346\226\207].yaml"
+++ "b/web/src/modules/base/locales/zh_CN[\347\256\200\344\275\223\344\270\255\346\226\207].yaml"
@@ -124,6 +124,18 @@ baseOperationLog:
   ip: 请求IP
   created_at: 创建时间
   updated_at: 更新时间
+baseDepartment:
+  name: 部门名称
+  created_at: 创建时间
+  updated_at: 更新时间
+  parentDepartment: 上级部门
+  page:
+    mainTitle: 部门管理
+    subTitle: 提供公司、机构的人员部门管理、以及部门负责人。
+    setLeader: 设置负责人
+  placeholder:
+    name: 请输入部门名称
+    parentDepartment: 请选择上级部门
 baseMenu:
   permission:
     index: 权限管理
@@ -147,6 +159,11 @@ baseMenu:
     menuSave: 菜单保存
     menuUpdate: 菜单更新
     menuDelete: 菜单删除
+    department: 部门管理
+    departmentList: 部门列表
+    departmentCreate: 新增部门
+    departmentSave: 编辑部门
+    departmentDelete: 删除部门
   log:
     index: 日志管理
     userLoginLog: 登录日志
diff --git a/web/src/modules/base/views/permission/department/data/getFormItems.tsx b/web/src/modules/base/views/permission/department/data/getFormItems.tsx
new file mode 100644
index 000000000..aa1659b8d
--- /dev/null
+++ b/web/src/modules/base/views/permission/department/data/getFormItems.tsx
@@ -0,0 +1,46 @@
+/**
+ * MineAdmin is committed to providing solutions for quickly building web applications
+ * Please view the LICENSE file that was distributed with this source code,
+ * For the full copyright and license information.
+ * Thank you very much for using MineAdmin.
+ *
+ * @Author X.Mo<root@imoi.cn>
+ * @Link   https://github.com/mineadmin
+ */
+import type { MaFormItem } from '@mineadmin/form'
+
+export default function getFormItems(formType: 'add' | 'edit' = 'add', t: any): MaFormItem[] {
+  const treeSelectRef = ref()
+  const deptList = ref([])
+
+  return [
+    {
+      label: () => t('baseDepartment.parentDepartment'), prop: 'parent_id', render: () => (
+        <el-tree-select
+          ref={treeSelectRef}
+          data={deptList.value}
+          props={{ value: 'id', label: 'name' }}
+          check-strictly={true}
+          default-expand-all={true}
+          clearable={true}
+        >
+        </el-tree-select>
+      ),
+      renderProps: {
+        class: 'w-full',
+        placeholder: t('baseDepartment.placeholder.parentDepartment'),
+      },
+    },
+    {
+      label: () => t('baseDepartment.name'),
+      prop: 'name',
+      render: 'input',
+      renderProps: {
+        placeholder: t('form.pleaseInput', { msg: t('baseDepartment.name') }),
+      },
+      itemProps: {
+        rules: [{ required: true, message: t('form.requiredInput', { msg: t('baseDepartment.placeholder.name') }) }],
+      },
+    },
+  ]
+}
diff --git a/web/src/modules/base/views/permission/department/data/getSearchItems.tsx b/web/src/modules/base/views/permission/department/data/getSearchItems.tsx
new file mode 100644
index 000000000..2e5151200
--- /dev/null
+++ b/web/src/modules/base/views/permission/department/data/getSearchItems.tsx
@@ -0,0 +1,21 @@
+/**
+ * MineAdmin is committed to providing solutions for quickly building web applications
+ * Please view the LICENSE file that was distributed with this source code,
+ * For the full copyright and license information.
+ * Thank you very much for using MineAdmin.
+ *
+ * @Author X.Mo<root@imoi.cn>
+ * @Link   https://github.com/mineadmin
+ */
+
+import type { MaSearchItem } from '@mineadmin/search'
+
+export default function getSearchItems(t: any): MaSearchItem[] {
+  return [
+    {
+      label: () => t('baseDepartment.name'),
+      prop: 'name',
+      render: 'input',
+    },
+  ]
+}
diff --git a/web/src/modules/base/views/permission/department/data/getTableColumns.tsx b/web/src/modules/base/views/permission/department/data/getTableColumns.tsx
new file mode 100644
index 000000000..a3a9950c0
--- /dev/null
+++ b/web/src/modules/base/views/permission/department/data/getTableColumns.tsx
@@ -0,0 +1,87 @@
+/**
+ * MineAdmin is committed to providing solutions for quickly building web applications
+ * Please view the LICENSE file that was distributed with this source code,
+ * For the full copyright and license information.
+ * Thank you very much for using MineAdmin.
+ *
+ * @Author X.Mo<root@imoi.cn>
+ * @Link   https://github.com/mineadmin
+ */
+import type { MaProTableColumns, MaProTableExpose } from '@mineadmin/pro-table'
+import type { RoleVo } from '~/base/api/role.ts'
+import type { UseDialogExpose } from '@/hooks/useDialog.ts'
+
+import { useMessage } from '@/hooks/useMessage.ts'
+import { deleteByIds } from '~/base/api/role.ts'
+import { ResultCode } from '@/utils/ResultCode.ts'
+import hasAuth from '@/utils/permission/hasAuth.ts'
+
+export default function getTableColumns(dialog: UseDialogExpose, formRef: any, t: any): MaProTableColumns[] {
+  const dictStore = useDictStore()
+  const msg = useMessage()
+
+  const showBtn = (auth: string | string[], row: RoleVo) => {
+    return hasAuth(auth) && row.id !== 1
+  }
+
+  return [
+    // 多选列
+    { type: 'selection', showOverflowTooltip: false, label: () => t('crud.selection'),
+      cellRender: ({ row }): any => row.id === 1 ? '-' : undefined,
+      selectable: (row: RoleVo) => ![1].includes(row.id as number),
+    },
+    // 索引序号列
+    { type: 'index' },
+    // 普通列
+    { label: () => t('baseDepartment.name'), prop: 'name' },
+    { label: () => t('baseDepartment.created_at'), prop: 'created_at' },
+    { label: () => t('baseDepartment.updated_at'), prop: 'updated_at' },
+
+    // 操作列
+    {
+      type: 'operation',
+      label: () => t('crud.operation'),
+      width: '260px',
+      operationConfigure: {
+        type: 'tile',
+        actions: [
+          {
+            name: 'setLeader',
+            show: ({ row }) => showBtn(['permission:department:save'], row),
+            icon: 'material-symbols:checklist-rounded',
+            text: () => t('baseDepartment.page.setLeader'),
+            onClick: ({ row }) => {
+              dialog.setTitle(t('baseDepartment.page.setLeader'))
+              dialog.open({ formType: 'setLeader', data: row })
+            },
+          },
+          {
+            name: 'edit',
+            icon: 'material-symbols:person-edit',
+            show: ({ row }) => showBtn('permission:department:save', row),
+            text: () => t('crud.edit'),
+            onClick: ({ row }) => {
+              dialog.setTitle(t('crud.edit'))
+              dialog.open({ formType: 'edit', data: row })
+            },
+          },
+          {
+            name: 'del',
+            show: ({ row }) => showBtn('permission:department:delete', row),
+            icon: 'mdi:delete',
+            text: () => t('crud.delete'),
+            onClick: ({ row }, proxy: MaProTableExpose) => {
+              msg.delConfirm(t('crud.delDataMessage')).then(async () => {
+                const response = await deleteByIds([row.id])
+                if (response.code === ResultCode.SUCCESS) {
+                  msg.success(t('crud.delSuccess'))
+                  await proxy.refresh()
+                }
+              })
+            },
+          },
+        ],
+      },
+    },
+  ]
+}
diff --git a/web/src/modules/base/views/permission/department/form.vue b/web/src/modules/base/views/permission/department/form.vue
new file mode 100644
index 000000000..4a6bc900c
--- /dev/null
+++ b/web/src/modules/base/views/permission/department/form.vue
@@ -0,0 +1,76 @@
+<!--
+ - MineAdmin is committed to providing solutions for quickly building web applications
+ - Please view the LICENSE file that was distributed with this source code,
+ - For the full copyright and license information.
+ - Thank you very much for using MineAdmin.
+ -
+ - @Author X.Mo<root@imoi.cn>
+ - @Link   https://github.com/mineadmin
+-->
+<script setup lang="ts">
+import type { DepartmentVo } from '~/base/api/department.ts'
+import { create, save } from '~/base/api/department'
+import getFormItems from './data/getFormItems.tsx'
+import type { MaFormExpose } from '@mineadmin/form'
+import useForm from '@/hooks/useForm.ts'
+import { ResultCode } from '@/utils/ResultCode.ts'
+
+defineOptions({ name: 'permission:department:form' })
+
+const { formType = 'add', data = null } = defineProps<{
+  formType: 'add' | 'edit'
+  data?: DepartmentVo | null
+}>()
+
+const t = useTrans().globalTrans
+const departmentForm = ref<MaFormExpose>()
+const deptModel = ref<DepartmentVo>({})
+
+useForm('departmentForm').then((form: MaFormExpose) => {
+  if (formType === 'edit' && data) {
+    Object.keys(data).map((key: string) => {
+      deptModel.value[key] = data[key]
+    })
+  }
+  form.setItems(getFormItems(formType, t, deptModel.value))
+  form.setOptions({
+    labelWidth: '80px',
+  })
+})
+
+// 创建操作
+function add(): Promise<any> {
+  return new Promise((resolve, reject) => {
+    create(deptModel.value).then((res: any) => {
+      res.code === ResultCode.SUCCESS ? resolve(res) : reject(res)
+    }).catch((err) => {
+      reject(err)
+    })
+  })
+}
+
+// 更新操作
+function edit(): Promise<any> {
+  return new Promise((resolve, reject) => {
+    save(deptModel.value.id as number, deptModel.value).then((res: any) => {
+      res.code === ResultCode.SUCCESS ? resolve(res) : reject(res)
+    }).catch((err) => {
+      reject(err)
+    })
+  })
+}
+
+defineExpose({
+  add,
+  edit,
+  maForm: departmentForm,
+})
+</script>
+
+<template>
+  <ma-form ref="departmentForm" v-model="deptModel" />
+</template>
+
+<style scoped lang="scss">
+
+</style>
diff --git a/web/src/modules/base/views/permission/department/index.vue b/web/src/modules/base/views/permission/department/index.vue
new file mode 100644
index 000000000..be7f2cdcf
--- /dev/null
+++ b/web/src/modules/base/views/permission/department/index.vue
@@ -0,0 +1,197 @@
+<!--
+ - MineAdmin is committed to providing solutions for quickly building web applications
+ - Please view the LICENSE file that was distributed with this source code,
+ - For the full copyright and license information.
+ - Thank you very much for using MineAdmin.
+ -
+ - @Author X.Mo<root@imoi.cn>
+ - @Link   https://github.com/mineadmin
+-->
+<script setup lang="tsx">
+import type { MaProTableExpose, MaProTableOptions, MaProTableSchema } from '@mineadmin/pro-table'
+import type { Ref } from 'vue'
+import type { TransType } from '@/hooks/auto-imports/useTrans.ts'
+import type { UseDialogExpose } from '@/hooks/useDialog.ts'
+
+import { deleteByIds, page } from '~/base/api/department.ts'
+import getSearchItems from './data/getSearchItems.tsx'
+import getTableColumns from './data/getTableColumns.tsx'
+import useDialog from '@/hooks/useDialog.ts'
+import { useMessage } from '@/hooks/useMessage.ts'
+import { ResultCode } from '@/utils/ResultCode.ts'
+
+import DepartmentForm from './form.vue'
+// import SetLeader from './setLeader.vue'
+
+defineOptions({ name: 'permission:department' })
+
+const proTableRef = ref<MaProTableExpose>() as Ref<MaProTableExpose>
+const formRef = ref()
+const setFormRef = ref()
+const selections = ref<any[]>([])
+const i18n = useTrans() as TransType
+const t = i18n.globalTrans
+const msg = useMessage()
+
+// 弹窗配置
+const maDialog: UseDialogExpose = useDialog({
+  lgWidth: '550px',
+  // 保存数据
+  ok: ({ formType }, okLoadingState: (state: boolean) => void) => {
+    okLoadingState(true)
+    if (['add', 'edit'].includes(formType)) {
+      const elForm = formRef.value.maForm.getElFormRef()
+      // 验证通过后
+      elForm.validate().then(() => {
+        switch (formType) {
+          // 新增
+          case 'add':
+            formRef.value.add().then((res: any) => {
+              res.code === ResultCode.SUCCESS ? msg.success(t('crud.createSuccess')) : msg.error(res.message)
+              maDialog.close()
+              proTableRef.value.refresh()
+            }).catch((err: any) => {
+              msg.alertError(err)
+            })
+            break
+          // 修改
+          case 'edit':
+            formRef.value.edit().then((res: any) => {
+              res.code === 200 ? msg.success(t('crud.updateSuccess')) : msg.error(res.message)
+              maDialog.close()
+              proTableRef.value.refresh()
+            }).catch((err: any) => {
+              msg.alertError(err)
+            })
+            break
+        }
+      }).catch()
+    }
+    else {
+      const elForm = setFormRef.value.maForm.getElFormRef()
+      // 验证通过后
+      elForm.validate().then(() => {
+        // 设置负责人
+        setFormRef.value.saveUserRole().then((res: any) => {
+          res.code === ResultCode.SUCCESS ? msg.success(t('baseUserManage.setRoleSuccess')) : msg.error(res.message)
+          maDialog.close()
+        }).catch((err: any) => {
+          msg.alertError(err)
+        })
+      })
+    }
+    okLoadingState(false)
+  },
+})
+
+// 参数配置
+const options = ref<MaProTableOptions>({
+  // 表格距离底部的像素偏移适配
+  adaptionOffsetBottom: 161,
+  header: {
+    mainTitle: () => t('baseDepartment.page.mainTitle'),
+    subTitle: () => t('baseDepartment.page.subTitle'),
+  },
+  // 表格参数
+  tableOptions: {
+    on: {
+      // 表格选择事件
+      onSelectionChange: (selection: any[]) => selections.value = selection,
+    },
+  },
+  // 搜索参数
+  searchOptions: {
+    fold: true,
+    text: {
+      searchBtn: () => t('crud.search'),
+      resetBtn: () => t('crud.reset'),
+      isFoldBtn: () => t('crud.searchFold'),
+      notFoldBtn: () => t('crud.searchUnFold'),
+    },
+  },
+  // 搜索表单参数
+  searchFormOptions: { labelWidth: '90px' },
+  // 请求配置
+  requestOptions: {
+    api: page,
+  },
+})
+// 架构配置
+const schema = ref<MaProTableSchema>({
+  // 搜索项
+  searchItems: getSearchItems(t),
+  // 表格列
+  tableColumns: getTableColumns(maDialog, formRef, t),
+})
+
+// 批量删除
+function handleDelete() {
+  const ids = selections.value.map((item: any) => item.id)
+  msg.confirm(t('crud.delMessage')).then(async () => {
+    const response = await deleteByIds(ids)
+    if (response.code === ResultCode.SUCCESS) {
+      msg.success(t('crud.delSuccess'))
+      await proTableRef.value.refresh()
+    }
+  })
+}
+</script>
+
+<template>
+  <div class="mine-layout pt-3">
+    <MaProTable ref="proTableRef" :options="options" :schema="schema">
+      <template #actions>
+        <el-button
+          v-auth="['permission:department:create']"
+          type="primary"
+          @click="() => {
+            maDialog.setTitle(t('crud.add'))
+            maDialog.open({ formType: 'add' })
+          }"
+        >
+          {{ t('crud.add') }}
+        </el-button>
+      </template>
+
+      <template #toolbarLeft>
+        <el-button
+          v-auth="['permission:department:delete']"
+          type="danger"
+          plain
+          :disabled="selections.length < 1"
+          @click="handleDelete"
+        >
+          {{ t('crud.delete') }}
+        </el-button>
+      </template>
+      <!-- 数据为空时 -->
+      <template #empty>
+        <el-empty>
+          <el-button
+            v-auth="['permission:department:create']"
+            type="primary"
+            @click="() => {
+              maDialog.setTitle(t('crud.add'))
+              maDialog.open({ formType: 'add' })
+            }"
+          >
+            {{ t('crud.add') }}
+          </el-button>
+        </el-empty>
+      </template>
+    </MaProTable>
+
+    <component :is="maDialog.Dialog">
+      <template #default="{ formType, data }">
+        <!-- 新增、编辑表单 -->
+        <DepartmentForm v-if="formType !== 'setLeader'" ref="formRef" :form-type="formType" :data="data" />
+        <!-- 赋予菜单表单 -->
+        <!--        <SetLeader v-else ref="setFormRef" :data="data" /> -->
+      </template>
+    </component>
+  </div>
+</template>
+
+<style scoped lang="scss">
+
+</style>
diff --git a/web/src/modules/base/views/permission/department/setLeader.vue b/web/src/modules/base/views/permission/department/setLeader.vue
new file mode 100644
index 000000000..cae37eb79
--- /dev/null
+++ b/web/src/modules/base/views/permission/department/setLeader.vue
@@ -0,0 +1,111 @@
+<!--
+ - MineAdmin is committed to providing solutions for quickly building web applications
+ - Please view the LICENSE file that was distributed with this source code,
+ - For the full copyright and license information.
+ - Thank you very much for using MineAdmin.
+ -
+ - @Author X.Mo<root@imoi.cn>
+ - @Link https://github.com/mineadmin
+-->
+
+<script setup lang="tsx">
+import type { MaFormExpose } from '@mineadmin/form'
+import type { DepartmentVo } from '~/base/api/department.ts'
+// import { getRolePermission, setRolePermission } from '~/base/api/department.ts'
+import { page } from '~/base/api/menu.ts'
+
+import useForm from '@/hooks/useForm.ts'
+
+import MaTree from '@/components/ma-tree/index.vue'
+import { ResultCode } from '@/utils/ResultCode.ts'
+
+const { data = null } = defineProps<{
+  data?: DepartmentVo | null
+}>()
+
+const t = useTrans().globalTrans
+const departmentForm = ref<MaFormExpose>()
+const userModel = ref<{ id?: number }>({})
+const checkStrictly = ref<boolean>(false)
+
+const permissionTreeRef = ref<any>()
+
+useForm('departmentForm').then(async (form: MaFormExpose) => {
+  const names: string[] = []
+  if (data?.id) {
+    userModel.value.id = data.id
+    // const response: any = await getRolePermission(data?.id)
+    if (response.code === ResultCode.SUCCESS && response.data) {
+      response.data.map((item: any) => {
+        names.push(item.name)
+      })
+      checkStrictly.value = true
+    }
+  }
+
+  const menuRes = await page()
+  form.setItems([
+    {
+      label: () => t('baseRoleManage.permission'),
+      prop: 'permission_id',
+      render: () => MaTree,
+      renderProps: {
+        ref: (el: any) => permissionTreeRef.value = el,
+        class: 'w-full',
+        showCheckbox: true,
+        treeKey: 'meta.title',
+        placeholder: t('form.pleaseSelect', { msg: t('baseRoleManage.permission') }),
+        nodeKey: 'name',
+        data: menuRes.data,
+      },
+      renderSlots: {
+        default: ({ data }) => {
+          return (
+            <div class="mine-tree-node">
+              <div class="label">
+                { data.meta?.icon && <ma-svg-icon name={data.meta?.icon} size={16} />}
+                { data.meta?.i18n ? t(data.meta?.i18n) : data.meta.title ?? 'unknown' }
+              </div>
+            </div>
+          )
+        },
+      },
+    },
+  ])
+  form.setOptions({
+    labelWidth: '80px',
+  })
+
+  await nextTick(() => {
+    permissionTreeRef.value?.setCheckStrictly(!!userModel.value?.id)
+    setTimeout(() => {
+      permissionTreeRef.value?.elTree?.setCheckedKeys?.(names)
+    }, 50)
+  })
+})
+
+// 保存用户角色
+function saveUserRole(): Promise<any> {
+  return new Promise((resolve, reject) => {
+    const elTree = permissionTreeRef.value.elTree
+    // setRolePermission(userModel.value.id as number, elTree.getCheckedKeys() as string[]).then((res: any) => {
+      res.code === ResultCode.SUCCESS ? resolve(res) : reject(res)
+    }).catch((err) => {
+      reject(err)
+    })
+  })
+}
+
+defineExpose({
+  saveUserRole,
+  maForm: departmentForm,
+})
+</script>
+
+<template>
+  <ma-form ref="departmentForm" v-model="userModel" />
+</template>
+
+<style scoped lang="scss">
+
+</style>
diff --git a/web/src/modules/base/views/permission/menu/index.vue b/web/src/modules/base/views/permission/menu/index.vue
index 2a8da12c6..4733b35e8 100644
--- a/web/src/modules/base/views/permission/menu/index.vue
+++ b/web/src/modules/base/views/permission/menu/index.vue
@@ -11,7 +11,8 @@
 import type { ElForm } from 'element-plus'
 import { useMessage } from '@/hooks/useMessage.ts'
 import getOnlyWorkAreaHeight from '@/utils/getOnlyWorkAreaHeight.ts'
-import { create, type MenuVo, page, save } from '~/base/api/menu.ts'
+import { create, page, save } from '~/base/api/menu.ts'
+import type { MenuVo } from '~/base/api/menu.ts'
 
 import MenuTree from './menu-tree.vue'
 import MenuForm from './menu-form.vue'
diff --git a/web/types/components.d.ts b/web/types/components.d.ts
index c275c2151..e20d9e3f2 100644
--- a/web/types/components.d.ts
+++ b/web/types/components.d.ts
@@ -2,6 +2,7 @@
 // @ts-nocheck
 // Generated by unplugin-vue-components
 // Read more: https://github.com/vuejs/core/pull/3399
+// biome-ignore lint: disable
 export {}
 
 /* prettier-ignore */
@@ -10,6 +11,8 @@ declare module 'vue' {
     Form: typeof import('./../src/components/ma-key-value/components/form.vue')['default']
     MaAuth: typeof import('./../src/components/ma-auth/index.vue')['default']
     MaCitySelect: typeof import('./../src/components/ma-city-select/index.vue')['default']
+    MaColCard: typeof import('./../src/components/ma-col-card/index.vue')['default']
+    MaColsCard: typeof import('./../src/components/ma-cols-card/index.vue')['default']
     MaDialog: typeof import('./../src/components/ma-dialog/index.vue')['default']
     MaDictCheckbox: typeof import('./../src/components/ma-dict-picker/ma-dict-checkbox.vue')['default']
     MaDictRadio: typeof import('./../src/components/ma-dict-picker/ma-dict-radio.vue')['default']

From 55a9a07405834eadaed57316ba680fe7f069b597 Mon Sep 17 00:00:00 2001
From: zds <49744633+zds-s@users.noreply.github.com>
Date: Mon, 10 Mar 2025 15:11:19 +0800
Subject: [PATCH 11/91] fix

---
 app/Model/Permission/Department.php                | 5 +++++
 app/Repository/Permission/DepartmentRepository.php | 1 +
 2 files changed, 6 insertions(+)

diff --git a/app/Model/Permission/Department.php b/app/Model/Permission/Department.php
index 4bbc3bb3f..8bb57ea69 100644
--- a/app/Model/Permission/Department.php
+++ b/app/Model/Permission/Department.php
@@ -63,4 +63,9 @@ public function leader(): BelongsToMany
     {
         return $this->belongsToMany(User::class, 'dept_leader', 'dept_id', 'user_id');
     }
+
+    public function children(): HasMany
+    {
+        return $this->hasMany(Department::class, 'parent_id', 'id');
+    }
 }
diff --git a/app/Repository/Permission/DepartmentRepository.php b/app/Repository/Permission/DepartmentRepository.php
index ee4ddb875..bdf303027 100644
--- a/app/Repository/Permission/DepartmentRepository.php
+++ b/app/Repository/Permission/DepartmentRepository.php
@@ -43,6 +43,7 @@ public function handleSearch(Builder $query, array $params): Builder
             ->when(isset($params['level']), static function (Builder $query) use ($params) {
                 if ($params['level'] === 1) {
                     $query->where('parent_id', 0);
+                    $query->with('children');
                 }
 
                 // todo 指定层级查询

From 1ab2925245975f2711815d678158cb1c43960d73 Mon Sep 17 00:00:00 2001
From: zds <49744633+zds-s@users.noreply.github.com>
Date: Mon, 10 Mar 2025 15:17:07 +0800
Subject: [PATCH 12/91] feat: enhance Department management with transaction
 handling and validation improvements

---
 .../Request/Permission/DepartmentRequest.php  |  6 ++--
 app/Service/Permission/DepartmentService.php  | 33 +++++++++++++++++++
 2 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/app/Http/Admin/Request/Permission/DepartmentRequest.php b/app/Http/Admin/Request/Permission/DepartmentRequest.php
index e50b983ca..715e2e57a 100644
--- a/app/Http/Admin/Request/Permission/DepartmentRequest.php
+++ b/app/Http/Admin/Request/Permission/DepartmentRequest.php
@@ -45,12 +45,10 @@ public function rules(): array
         if ($this->isUpdate()) {
             $rules['name'] = 'required|string|max:60|unique:department,name,' . $this->route('id');
         }
-        $rules['positions'] = 'sometimes|array';
-        $rules['positions.*.id'] = 'sometimes|integer';
         $rules['department_users'] = 'sometimes|array';
-        $rules['department_users.*.id'] = 'sometimes|integer';
+        $rules['department_users.*'] = 'sometimes|integer';
         $rules['leader'] = 'sometimes|array';
-        $rules['leader.*.id'] = 'sometimes|integer';
+        $rules['leader.*'] = 'sometimes|integer';
         return $rules;
     }
 
diff --git a/app/Service/Permission/DepartmentService.php b/app/Service/Permission/DepartmentService.php
index 62f8ce358..402f2e10e 100644
--- a/app/Service/Permission/DepartmentService.php
+++ b/app/Service/Permission/DepartmentService.php
@@ -12,9 +12,12 @@
 
 namespace App\Service\Permission;
 
+use App\Exception\BusinessException;
+use App\Http\Common\ResultCode;
 use App\Model\Permission\Department;
 use App\Repository\Permission\DepartmentRepository;
 use App\Service\IService;
+use Hyperf\DbConnection\Db;
 
 /**
  * @extends IService<Department>
@@ -24,4 +27,34 @@ class DepartmentService extends IService
     public function __construct(
         protected readonly DepartmentRepository $repository
     ) {}
+
+    public function create(array $data): mixed
+    {
+        return Db::transaction(function () use ($data) {
+            $entity = $this->repository->create($data);
+            $this->handleEntity($entity,$data);
+            return $entity;
+        });
+    }
+
+    public function updateById(mixed $id, array $data): mixed
+    {
+        return Db::transaction(function () use ($id, $data) {
+            $entity = $this->repository->findById($id);
+            if (empty($entity)){
+                throw new BusinessException(ResultCode::NOT_FOUND);
+            }
+            $this->handleEntity($entity,$data);
+        });
+    }
+
+    protected function handleEntity(Department $entity,array $data): void
+    {
+        if (!empty($data['department_users'])){
+            $entity->department_users()->sync($data['department_users']);
+        }
+        if (!empty($data['leader'])){
+            $entity->leader()->sync($data['leader']);
+        }
+    }
 }

From e49cfd5d318f6b6d8b49f32c868dda4d7b995b2f Mon Sep 17 00:00:00 2001
From: zds <49744633+zds-s@users.noreply.github.com>
Date: Mon, 10 Mar 2025 15:17:44 +0800
Subject: [PATCH 13/91] feat: update operation IDs in DepartmentController for
 clarity and consistency

---
 .../Admin/Controller/Permission/DepartmentController.php  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/Http/Admin/Controller/Permission/DepartmentController.php b/app/Http/Admin/Controller/Permission/DepartmentController.php
index b4eb40480..73722f4a8 100644
--- a/app/Http/Admin/Controller/Permission/DepartmentController.php
+++ b/app/Http/Admin/Controller/Permission/DepartmentController.php
@@ -46,7 +46,7 @@ public function __construct(
 
     #[Get(
         path: '/admin/department/list',
-        operationId: 'roleList',
+        operationId: 'departmentList',
         summary: '岗位列表',
         security: [['Bearer' => [], 'ApiKey' => []]],
         tags: ['岗位管理'],
@@ -66,7 +66,7 @@ public function pageList(): Result
 
     #[Post(
         path: '/admin/department',
-        operationId: 'roleCreate',
+        operationId: 'departmentCreate',
         summary: '创建岗位',
         security: [['Bearer' => [], 'ApiKey' => []]],
         tags: ['岗位管理'],
@@ -86,7 +86,7 @@ public function create(DepartmentRequest $request): Result
 
     #[Put(
         path: '/admin/department/{id}',
-        operationId: 'roleSave',
+        operationId: 'departmentSave',
         summary: '保存岗位',
         security: [['Bearer' => [], 'ApiKey' => []]],
         tags: ['岗位管理'],
@@ -106,7 +106,7 @@ public function save(int $id, DepartmentRequest $request): Result
 
     #[Delete(
         path: '/admin/department',
-        operationId: 'roleDelete',
+        operationId: 'departmentDelete',
         summary: '删除岗位',
         security: [['Bearer' => [], 'ApiKey' => []]],
         tags: ['岗位管理'],

From b6ed70fa54e6ed4f7cf2f3677215793156b323b0 Mon Sep 17 00:00:00 2001
From: "X.Mo" <root@imoi.cn>
Date: Mon, 10 Mar 2025 15:18:18 +0800
Subject: [PATCH 14/91] =?UTF-8?q?feat:=20=E9=83=A8=E9=97=A8=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=89=8D=E7=AB=AF=E9=A1=B5=E9=9D=A2.=20-=202?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Permission/DepartmentController.php       | 16 +++++++-------
 .../department/data/getTableColumns.tsx       | 21 +++++++------------
 .../views/permission/department/index.vue     |  4 ++--
 3 files changed, 17 insertions(+), 24 deletions(-)

diff --git a/app/Http/Admin/Controller/Permission/DepartmentController.php b/app/Http/Admin/Controller/Permission/DepartmentController.php
index b4eb40480..c12e22510 100644
--- a/app/Http/Admin/Controller/Permission/DepartmentController.php
+++ b/app/Http/Admin/Controller/Permission/DepartmentController.php
@@ -47,9 +47,9 @@ public function __construct(
     #[Get(
         path: '/admin/department/list',
         operationId: 'roleList',
-        summary: '岗位列表',
+        summary: '部门列表',
         security: [['Bearer' => [], 'ApiKey' => []]],
-        tags: ['岗位管理'],
+        tags: ['部门管理'],
     )]
     #[PageResponse(instance: DepartmentSchema::class)]
     #[Permission(code: 'permission:department:index')]
@@ -67,9 +67,9 @@ public function pageList(): Result
     #[Post(
         path: '/admin/department',
         operationId: 'roleCreate',
-        summary: '创建岗位',
+        summary: '创建部门',
         security: [['Bearer' => [], 'ApiKey' => []]],
-        tags: ['岗位管理'],
+        tags: ['部门管理'],
     )]
     #[RequestBody(
         content: new JsonContent(ref: DepartmentRequest::class)
@@ -87,9 +87,9 @@ public function create(DepartmentRequest $request): Result
     #[Put(
         path: '/admin/department/{id}',
         operationId: 'roleSave',
-        summary: '保存岗位',
+        summary: '保存部门',
         security: [['Bearer' => [], 'ApiKey' => []]],
-        tags: ['岗位管理'],
+        tags: ['部门管理'],
     )]
     #[RequestBody(
         content: new JsonContent(ref: DepartmentRequest::class)
@@ -107,9 +107,9 @@ public function save(int $id, DepartmentRequest $request): Result
     #[Delete(
         path: '/admin/department',
         operationId: 'roleDelete',
-        summary: '删除岗位',
+        summary: '删除部门',
         security: [['Bearer' => [], 'ApiKey' => []]],
-        tags: ['岗位管理'],
+        tags: ['部门管理'],
     )]
     #[ResultResponse(instance: new Result())]
     #[Permission(code: 'permission:department:delete')]
diff --git a/web/src/modules/base/views/permission/department/data/getTableColumns.tsx b/web/src/modules/base/views/permission/department/data/getTableColumns.tsx
index a3a9950c0..65e02732e 100644
--- a/web/src/modules/base/views/permission/department/data/getTableColumns.tsx
+++ b/web/src/modules/base/views/permission/department/data/getTableColumns.tsx
@@ -8,30 +8,23 @@
  * @Link   https://github.com/mineadmin
  */
 import type { MaProTableColumns, MaProTableExpose } from '@mineadmin/pro-table'
-import type { RoleVo } from '~/base/api/role.ts'
 import type { UseDialogExpose } from '@/hooks/useDialog.ts'
 
 import { useMessage } from '@/hooks/useMessage.ts'
-import { deleteByIds } from '~/base/api/role.ts'
+import { deleteByIds } from '~/base/api/department.ts'
 import { ResultCode } from '@/utils/ResultCode.ts'
 import hasAuth from '@/utils/permission/hasAuth.ts'
 
 export default function getTableColumns(dialog: UseDialogExpose, formRef: any, t: any): MaProTableColumns[] {
-  const dictStore = useDictStore()
   const msg = useMessage()
 
-  const showBtn = (auth: string | string[], row: RoleVo) => {
-    return hasAuth(auth) && row.id !== 1
+  const showBtn = (auth: string | string[]) => {
+    return hasAuth(auth)
   }
 
   return [
     // 多选列
-    { type: 'selection', showOverflowTooltip: false, label: () => t('crud.selection'),
-      cellRender: ({ row }): any => row.id === 1 ? '-' : undefined,
-      selectable: (row: RoleVo) => ![1].includes(row.id as number),
-    },
-    // 索引序号列
-    { type: 'index' },
+    { type: 'selection', showOverflowTooltip: false, label: () => t('crud.selection') },
     // 普通列
     { label: () => t('baseDepartment.name'), prop: 'name' },
     { label: () => t('baseDepartment.created_at'), prop: 'created_at' },
@@ -47,7 +40,7 @@ export default function getTableColumns(dialog: UseDialogExpose, formRef: any, t
         actions: [
           {
             name: 'setLeader',
-            show: ({ row }) => showBtn(['permission:department:save'], row),
+            show: () => showBtn('permission:department:update'),
             icon: 'material-symbols:checklist-rounded',
             text: () => t('baseDepartment.page.setLeader'),
             onClick: ({ row }) => {
@@ -58,7 +51,7 @@ export default function getTableColumns(dialog: UseDialogExpose, formRef: any, t
           {
             name: 'edit',
             icon: 'material-symbols:person-edit',
-            show: ({ row }) => showBtn('permission:department:save', row),
+            show: () => showBtn('permission:department:update'),
             text: () => t('crud.edit'),
             onClick: ({ row }) => {
               dialog.setTitle(t('crud.edit'))
@@ -67,7 +60,7 @@ export default function getTableColumns(dialog: UseDialogExpose, formRef: any, t
           },
           {
             name: 'del',
-            show: ({ row }) => showBtn('permission:department:delete', row),
+            show: () => showBtn('permission:department:delete'),
             icon: 'mdi:delete',
             text: () => t('crud.delete'),
             onClick: ({ row }, proxy: MaProTableExpose) => {
diff --git a/web/src/modules/base/views/permission/department/index.vue b/web/src/modules/base/views/permission/department/index.vue
index be7f2cdcf..4dc559359 100644
--- a/web/src/modules/base/views/permission/department/index.vue
+++ b/web/src/modules/base/views/permission/department/index.vue
@@ -142,7 +142,7 @@ function handleDelete() {
     <MaProTable ref="proTableRef" :options="options" :schema="schema">
       <template #actions>
         <el-button
-          v-auth="['permission:department:create']"
+          v-auth="['permission:department:save']"
           type="primary"
           @click="() => {
             maDialog.setTitle(t('crud.add'))
@@ -168,7 +168,7 @@ function handleDelete() {
       <template #empty>
         <el-empty>
           <el-button
-            v-auth="['permission:department:create']"
+            v-auth="['permission:department:save']"
             type="primary"
             @click="() => {
               maDialog.setTitle(t('crud.add'))

From 8c396326793fdc9273ab6bcf314d2ce9e308c40d Mon Sep 17 00:00:00 2001
From: zds <49744633+zds-s@users.noreply.github.com>
Date: Mon, 10 Mar 2025 15:18:30 +0800
Subject: [PATCH 15/91] feat: implement cascading delete for related models on
 Department deletion

---
 app/Model/Permission/Department.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/app/Model/Permission/Department.php b/app/Model/Permission/Department.php
index 8bb57ea69..9352fbe72 100644
--- a/app/Model/Permission/Department.php
+++ b/app/Model/Permission/Department.php
@@ -14,6 +14,7 @@
 
 use Carbon\Carbon;
 use Hyperf\Database\Model\Collection;
+use Hyperf\Database\Model\Events\Deleted;
 use Hyperf\Database\Model\Relations\BelongsToMany;
 use Hyperf\Database\Model\Relations\HasMany;
 use Hyperf\Database\Model\SoftDeletes;
@@ -49,6 +50,13 @@ class Department extends Model
      */
     protected array $casts = ['id' => 'integer', 'parent_id' => 'integer', 'created_at' => 'datetime', 'updated_at' => 'datetime', 'deleted_at' => 'datetime'];
 
+    public function deleted(Deleted $event): void
+    {
+        $this->positions()->delete();
+        $this->department_users()->detach();
+        $this->leader()->detach();
+    }
+
     public function positions(): HasMany
     {
         return $this->hasMany(Position::class, 'dept_id', 'id');

From fe28f9d13245c727344ff0cb5db926f8258e2ffc Mon Sep 17 00:00:00 2001
From: "X.Mo" <root@imoi.cn>
Date: Mon, 10 Mar 2025 15:59:18 +0800
Subject: [PATCH 16/91] styles: remove el-tag border (#557) (#558)


From 0675c38ecb0a5c6d2960c69cf106ab9989e87eec Mon Sep 17 00:00:00 2001
From: 1kb <1@1kb.ren>
Date: Mon, 10 Mar 2025 16:25:13 +0800
Subject: [PATCH 17/91] =?UTF-8?q?=E8=A1=A5=E5=85=85=E5=B2=97=E4=BD=8D?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97=E6=96=87=E4=BB=B6=20(#559)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix: 修正部门错别字

* feat: 补充岗位模块五大金刚文件
---
 .../Permission/DepartmentController.php       |   8 +-
 .../Permission/PositionController.php         | 121 ++++++++++++++++++
 .../Request/Permission/PositionRequest.php    |  58 +++++++++
 .../Permission/PositionRepository.php         |  45 +++++++
 app/Schema/PositionSchema.php                 |  50 ++++++++
 app/Service/Permission/PositionService.php    |  27 ++++
 6 files changed, 305 insertions(+), 4 deletions(-)
 create mode 100644 app/Http/Admin/Controller/Permission/PositionController.php
 create mode 100644 app/Http/Admin/Request/Permission/PositionRequest.php
 create mode 100644 app/Repository/Permission/PositionRepository.php
 create mode 100644 app/Schema/PositionSchema.php
 create mode 100644 app/Service/Permission/PositionService.php

diff --git a/app/Http/Admin/Controller/Permission/DepartmentController.php b/app/Http/Admin/Controller/Permission/DepartmentController.php
index 4557f8c64..57996ca84 100644
--- a/app/Http/Admin/Controller/Permission/DepartmentController.php
+++ b/app/Http/Admin/Controller/Permission/DepartmentController.php
@@ -47,7 +47,7 @@ public function __construct(
     #[Get(
         path: '/admin/department/list',
         operationId: 'departmentList',
-        summary: '岗位列表',
+        summary: '部门列表',
         security: [['Bearer' => [], 'ApiKey' => []]],
         tags: ['部门管理'],
     )]
@@ -67,7 +67,7 @@ public function pageList(): Result
     #[Post(
         path: '/admin/department',
         operationId: 'departmentCreate',
-        summary: '创建岗位',
+        summary: '创建部门',
         security: [['Bearer' => [], 'ApiKey' => []]],
         tags: ['部门管理'],
     )]
@@ -87,7 +87,7 @@ public function create(DepartmentRequest $request): Result
     #[Put(
         path: '/admin/department/{id}',
         operationId: 'departmentSave',
-        summary: '保存岗位',
+        summary: '保存部门',
         security: [['Bearer' => [], 'ApiKey' => []]],
         tags: ['部门管理'],
     )]
@@ -107,7 +107,7 @@ public function save(int $id, DepartmentRequest $request): Result
     #[Delete(
         path: '/admin/department',
         operationId: 'departmentDelete',
-        summary: '删除岗位',
+        summary: '删除部门',
         security: [['Bearer' => [], 'ApiKey' => []]],
         tags: ['部门管理'],
     )]
diff --git a/app/Http/Admin/Controller/Permission/PositionController.php b/app/Http/Admin/Controller/Permission/PositionController.php
new file mode 100644
index 000000000..002835e4e
--- /dev/null
+++ b/app/Http/Admin/Controller/Permission/PositionController.php
@@ -0,0 +1,121 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * This file is part of MineAdmin.
+ *
+ * @link     https://www.mineadmin.com
+ * @document https://doc.mineadmin.com
+ * @contact  root@imoi.cn
+ * @license  https://github.com/mineadmin/MineAdmin/blob/master/LICENSE
+ */
+
+namespace App\Http\Admin\Controller\Permission;
+
+use App\Http\Admin\Controller\AbstractController;
+use App\Http\Admin\Middleware\PermissionMiddleware;
+use App\Http\Admin\Request\Permission\PositionRequest;
+use App\Http\Common\Middleware\AccessTokenMiddleware;
+use App\Http\Common\Middleware\OperationMiddleware;
+use App\Http\Common\Result;
+use App\Http\CurrentUser;
+use App\Schema\PositionSchema;
+use App\Service\Permission\PositionService;
+use Hyperf\HttpServer\Annotation\Middleware;
+use Hyperf\Swagger\Annotation\Delete;
+use Hyperf\Swagger\Annotation\Get;
+use Hyperf\Swagger\Annotation\HyperfServer;
+use Hyperf\Swagger\Annotation\JsonContent;
+use Hyperf\Swagger\Annotation\Post;
+use Hyperf\Swagger\Annotation\Put;
+use Hyperf\Swagger\Annotation\RequestBody;
+use Mine\Access\Attribute\Permission;
+use Mine\Swagger\Attributes\PageResponse;
+use Mine\Swagger\Attributes\ResultResponse;
+
+#[HyperfServer(name: 'http')]
+#[Middleware(middleware: AccessTokenMiddleware::class, priority: 100)]
+#[Middleware(middleware: PermissionMiddleware::class, priority: 99)]
+#[Middleware(middleware: OperationMiddleware::class, priority: 98)]
+class PositionController extends AbstractController
+{
+    public function __construct(
+        protected readonly CurrentUser $currentUser,
+        protected readonly PositionService $service
+    ) {}
+
+    #[Get(
+        path: '/admin/position/list',
+        operationId: 'positionList',
+        summary: '岗位列表',
+        security: [['Bearer' => [], 'ApiKey' => []]],
+        tags: ['岗位管理'],
+    )]
+    #[PageResponse(instance: PositionSchema::class)]
+    #[Permission(code: 'permission:position:index')]
+    public function pageList(): Result
+    {
+        return $this->success(
+            $this->service->page(
+                $this->getRequestData(),
+                $this->getCurrentPage(),
+                $this->getPageSize()
+            )
+        );
+    }
+
+    #[Post(
+        path: '/admin/position',
+        operationId: 'positionCreate',
+        summary: '创建岗位',
+        security: [['Bearer' => [], 'ApiKey' => []]],
+        tags: ['岗位管理'],
+    )]
+    #[RequestBody(
+        content: new JsonContent(ref: PositionRequest::class)
+    )]
+    #[Permission(code: 'permission:position:save')]
+    #[ResultResponse(instance: new Result())]
+    public function create(PositionRequest $request): Result
+    {
+        $this->service->create(array_merge($request->validated(), [
+            'created_by' => $this->currentUser->id(),
+        ]));
+        return $this->success();
+    }
+
+    #[Put(
+        path: '/admin/position/{id}',
+        operationId: 'positionSave',
+        summary: '保存岗位',
+        security: [['Bearer' => [], 'ApiKey' => []]],
+        tags: ['岗位管理'],
+    )]
+    #[RequestBody(
+        content: new JsonContent(ref: PositionRequest::class)
+    )]
+    #[Permission(code: 'permission:position:update')]
+    #[ResultResponse(instance: new Result())]
+    public function save(int $id, PositionRequest $request): Result
+    {
+        $this->service->updateById($id, array_merge($request->validated(), [
+            'updated_by' => $this->currentUser->id(),
+        ]));
+        return $this->success();
+    }
+
+    #[Delete(
+        path: '/admin/position',
+        operationId: 'positionDelete',
+        summary: '删除岗位',
+        security: [['Bearer' => [], 'ApiKey' => []]],
+        tags: ['岗位管理'],
+    )]
+    #[ResultResponse(instance: new Result())]
+    #[Permission(code: 'permission:position:delete')]
+    public function delete(): Result
+    {
+        $this->service->deleteById($this->getRequestData());
+        return $this->success();
+    }
+} 
\ No newline at end of file
diff --git a/app/Http/Admin/Request/Permission/PositionRequest.php b/app/Http/Admin/Request/Permission/PositionRequest.php
new file mode 100644
index 000000000..6a059eb5f
--- /dev/null
+++ b/app/Http/Admin/Request/Permission/PositionRequest.php
@@ -0,0 +1,58 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * This file is part of MineAdmin.
+ *
+ * @link     https://www.mineadmin.com
+ * @document https://doc.mineadmin.com
+ * @contact  root@imoi.cn
+ * @license  https://github.com/mineadmin/MineAdmin/blob/master/LICENSE
+ */
+
+namespace App\Http\Admin\Request\Permission;
+
+use App\Http\Common\Request\Traits\HttpMethodTrait;
+use App\Http\Common\Request\Traits\NoAuthorizeTrait;
+use App\Schema\PositionSchema;
+use Hyperf\Validation\Request\FormRequest;
+
+#[\Mine\Swagger\Attributes\FormRequest(
+    schema: PositionSchema::class,
+    only: [
+        'name', 'dept_id',
+    ]
+)]
+class PositionRequest extends FormRequest
+{
+    use HttpMethodTrait;
+    use NoAuthorizeTrait;
+
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    public function rules(): array
+    {
+        $rules = [
+            'name' => 'required|string|max:50',
+            'dept_id' => 'required|integer|exists:department,id',
+        ];
+        if ($this->isCreate()) {
+            $rules['name'] = 'required|string|max:50|unique:position,name';
+        }
+        if ($this->isUpdate()) {
+            $rules['name'] = 'required|string|max:50|unique:position,name,' . $this->route('id');
+        }
+        return $rules;
+    }
+
+    public function attributes(): array
+    {
+        return [
+            'name' => '岗位名称',
+            'dept_id' => '部门ID',
+        ];
+    }
+} 
\ No newline at end of file
diff --git a/app/Repository/Permission/PositionRepository.php b/app/Repository/Permission/PositionRepository.php
new file mode 100644
index 000000000..2b0cd4aec
--- /dev/null
+++ b/app/Repository/Permission/PositionRepository.php
@@ -0,0 +1,45 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * This file is part of MineAdmin.
+ *
+ * @link     https://www.mineadmin.com
+ * @document https://doc.mineadmin.com
+ * @contact  root@imoi.cn
+ * @license  https://github.com/mineadmin/MineAdmin/blob/master/LICENSE
+ */
+
+namespace App\Repository\Permission;
+
+use App\Model\Permission\Position;
+use App\Repository\IRepository;
+use Hyperf\Database\Model\Builder;
+
+/**
+ * @extends IRepository<Position>
+ */
+final class PositionRepository extends IRepository
+{
+    public function __construct(
+        protected readonly Position $model
+    ) {}
+
+    public function handleSearch(Builder $query, array $params): Builder
+    {
+        return $query
+            ->when(isset($params['name']), static function (Builder $query) use ($params) {
+                $query->where('name', 'like', '%' . $params['name'] . '%');
+            })
+            ->when(isset($params['dept_id']), static function (Builder $query) use ($params) {
+                $query->where('dept_id', $params['dept_id']);
+            })
+            ->when(isset($params['created_at']), static function (Builder $query) use ($params) {
+                $query->whereBetween('created_at', $params['created_at']);
+            })
+            ->when(isset($params['updated_at']), static function (Builder $query) use ($params) {
+                $query->whereBetween('updated_at', $params['updated_at']);
+            })
+            ->with(['department']);
+    }
+} 
\ No newline at end of file
diff --git a/app/Schema/PositionSchema.php b/app/Schema/PositionSchema.php
new file mode 100644
index 000000000..668a2699c
--- /dev/null
+++ b/app/Schema/PositionSchema.php
@@ -0,0 +1,50 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * This file is part of MineAdmin.
+ *
+ * @link     https://www.mineadmin.com
+ * @document https://doc.mineadmin.com
+ * @contact  root@imoi.cn
+ * @license  https://github.com/mineadmin/MineAdmin/blob/master/LICENSE
+ */
+
+namespace App\Schema;
+
+use Hyperf\Swagger\Annotation\Items;
+use Hyperf\Swagger\Annotation\Property;
+use Hyperf\Swagger\Annotation\Schema;
+
+#[Schema(title: 'PositionSchema', description: '岗位模型')]
+class PositionSchema implements \JsonSerializable
+{
+    #[Property(property: 'id', title: '主键', type: 'int')]
+    public ?int $id;
+
+    #[Property(property: 'name', title: '岗位名称', type: 'string')]
+    public ?string $name;
+
+    #[Property(property: 'dept_id', title: '部门ID', type: 'int')]
+    public ?int $deptId;
+
+    #[Property(property: 'created_by', title: '创建者', type: 'int')]
+    public ?int $createdBy;
+
+    #[Property(property: 'updated_by', title: '更新者', type: 'int')]
+    public ?int $updatedBy;
+
+    #[Property(property: 'created_at', title: '', type: 'string')]
+    public mixed $createdAt;
+
+    #[Property(property: 'updated_at', title: '', type: 'string')]
+    public mixed $updatedAt;
+
+    #[Property(property: 'department', title: '所属部门', type: 'object', ref: '#/components/schemas/DepartmentSchema')]
+    public ?object $department;
+
+    public function jsonSerialize(): mixed
+    {
+        return [];
+    }
+} 
\ No newline at end of file
diff --git a/app/Service/Permission/PositionService.php b/app/Service/Permission/PositionService.php
new file mode 100644
index 000000000..f975cecc3
--- /dev/null
+++ b/app/Service/Permission/PositionService.php
@@ -0,0 +1,27 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * This file is part of MineAdmin.
+ *
+ * @link     https://www.mineadmin.com
+ * @document https://doc.mineadmin.com
+ * @contact  root@imoi.cn
+ * @license  https://github.com/mineadmin/MineAdmin/blob/master/LICENSE
+ */
+
+namespace App\Service\Permission;
+
+use App\Model\Permission\Position;
+use App\Repository\Permission\PositionRepository;
+use App\Service\IService;
+
+/**
+ * @extends IService<Position>
+ */
+class PositionService extends IService
+{
+    public function __construct(
+        protected readonly PositionRepository $repository
+    ) {}
+} 
\ No newline at end of file

From dbe139e356b302037bbd42795f89dd5ed3f1e335 Mon Sep 17 00:00:00 2001
From: zds <49744633+zds-s@users.noreply.github.com>
Date: Mon, 10 Mar 2025 16:25:43 +0800
Subject: [PATCH 18/91] feat: enhance User and Department models with
 relationships and validation rules

---
 .../Admin/Request/Permission/UserRequest.php  | 20 +++++++++++++++++++
 app/Model/Permission/Department.php           |  2 +-
 app/Model/Permission/User.php                 | 18 +++++++++++++++++
 app/Repository/Permission/UserRepository.php  | 15 +++++++++++++-
 app/Service/Permission/DepartmentService.php  | 12 +++++------
 app/Service/Permission/UserService.php        | 12 +++++++++++
 6 files changed, 71 insertions(+), 8 deletions(-)

diff --git a/app/Http/Admin/Request/Permission/UserRequest.php b/app/Http/Admin/Request/Permission/UserRequest.php
index 201332ce8..5667f78a2 100644
--- a/app/Http/Admin/Request/Permission/UserRequest.php
+++ b/app/Http/Admin/Request/Permission/UserRequest.php
@@ -82,6 +82,26 @@ public function rules(): array
                 'integer',
                 'in:0,1',
             ],
+            'department' => [
+                'sometimes',
+                'array',
+                'min:1',
+            ],
+            'department.*' => [
+                'sometimes',
+                'integer',
+                'exists:department,id',
+            ],
+            'position' => [
+                'sometimes',
+                'array',
+                'min:1',
+            ],
+            'position.*' => [
+                'sometimes',
+                'integer',
+                'exists:position,id',
+            ],
         ];
     }
 
diff --git a/app/Model/Permission/Department.php b/app/Model/Permission/Department.php
index 9352fbe72..44c56798a 100644
--- a/app/Model/Permission/Department.php
+++ b/app/Model/Permission/Department.php
@@ -74,6 +74,6 @@ public function leader(): BelongsToMany
 
     public function children(): HasMany
     {
-        return $this->hasMany(Department::class, 'parent_id', 'id');
+        return $this->hasMany(self::class, 'parent_id', 'id');
     }
 }
diff --git a/app/Model/Permission/User.php b/app/Model/Permission/User.php
index 14c40b61c..6b497af80 100644
--- a/app/Model/Permission/User.php
+++ b/app/Model/Permission/User.php
@@ -44,6 +44,9 @@
  * @property null|Collection|Role[] $roles
  * @property mixed $password 密码
  * @property null|Policy $policy 数据权限策略
+ * @property Collection|Department[] $department 部门
+ * @property Collection|Department[] $dept_leader 部门领导
+ * @property Collection|Position[] $position 岗位
  */
 final class User extends Model
 {
@@ -145,4 +148,19 @@ public function policy(): BelongsTo
     {
         return $this->belongsTo(Policy::class, 'id', 'id');
     }
+
+    public function department(): BelongsToMany
+    {
+        return $this->belongsToMany(Department::class, 'user_dept', 'user_id', 'dept_id');
+    }
+
+    public function dept_leader(): BelongsToMany
+    {
+        return $this->belongsToMany(Department::class, 'dept_leader', 'user_id', 'dept_id');
+    }
+
+    public function position(): BelongsToMany
+    {
+        return $this->belongsToMany(Position::class, 'user_position', 'user_id', 'position_id');
+    }
 }
diff --git a/app/Repository/Permission/UserRepository.php b/app/Repository/Permission/UserRepository.php
index ce37714ea..f112ec791 100644
--- a/app/Repository/Permission/UserRepository.php
+++ b/app/Repository/Permission/UserRepository.php
@@ -73,6 +73,19 @@ public function handleSearch(Builder $query, array $params): Builder
                     $query->where('role_id', $roleId);
                 });
             })
-            ->with(['policy']);
+            ->when(Arr::get($params, 'department_id'), static function (Builder $query, $departmentId) {
+                $query->where(static function (Builder $query) use ($departmentId) {
+                    $query->whereHas('department', static function (Builder $query) use ($departmentId) {
+                        $query->where('id', $departmentId);
+                    });
+                    $query->orWhereHas('dept_leader', static function (Builder $query) use ($departmentId) {
+                        $query->where('id', $departmentId);
+                    });
+                    $query->orWhereHas('position.department', static function (Builder $query) use ($departmentId) {
+                        $query->where('id', $departmentId);
+                    });
+                });
+            })
+            ->with(['policy', 'department', 'dept_leader', 'position']);
     }
 }
diff --git a/app/Service/Permission/DepartmentService.php b/app/Service/Permission/DepartmentService.php
index 402f2e10e..8977d8371 100644
--- a/app/Service/Permission/DepartmentService.php
+++ b/app/Service/Permission/DepartmentService.php
@@ -32,7 +32,7 @@ public function create(array $data): mixed
     {
         return Db::transaction(function () use ($data) {
             $entity = $this->repository->create($data);
-            $this->handleEntity($entity,$data);
+            $this->handleEntity($entity, $data);
             return $entity;
         });
     }
@@ -41,19 +41,19 @@ public function updateById(mixed $id, array $data): mixed
     {
         return Db::transaction(function () use ($id, $data) {
             $entity = $this->repository->findById($id);
-            if (empty($entity)){
+            if (empty($entity)) {
                 throw new BusinessException(ResultCode::NOT_FOUND);
             }
-            $this->handleEntity($entity,$data);
+            $this->handleEntity($entity, $data);
         });
     }
 
-    protected function handleEntity(Department $entity,array $data): void
+    protected function handleEntity(Department $entity, array $data): void
     {
-        if (!empty($data['department_users'])){
+        if (! empty($data['department_users'])) {
             $entity->department_users()->sync($data['department_users']);
         }
-        if (!empty($data['leader'])){
+        if (! empty($data['leader'])) {
             $entity->leader()->sync($data['leader']);
         }
     }
diff --git a/app/Service/Permission/UserService.php b/app/Service/Permission/UserService.php
index cd345f5ee..0ea0f27f7 100644
--- a/app/Service/Permission/UserService.php
+++ b/app/Service/Permission/UserService.php
@@ -81,6 +81,7 @@ public function create(array $data): mixed
             if (! empty($data['policy'])) {
                 $entity->policy()->create($data['policy']);
             }
+            $this->handleWith($entity, $data);
         });
     }
 
@@ -96,6 +97,17 @@ public function updateById(mixed $id, array $data): mixed
             if (! empty($data['policy'])) {
                 $entity->policy()->update($data['policy']);
             }
+            $this->handleWith($entity, $data);
         });
     }
+
+    protected function handleWith(User $entity, array $data): void
+    {
+        if (! empty($data['department'])) {
+            $entity->department()->sync($data['department']);
+        }
+        if (! empty($data['position'])) {
+            $entity->position()->sync($data['position']);
+        }
+    }
 }

From d60baff90de7f96376e919fd1ccb089cdcdffb50 Mon Sep 17 00:00:00 2001
From: "X.Mo" <root@imoi.cn>
Date: Mon, 10 Mar 2025 16:56:33 +0800
Subject: [PATCH 19/91] =?UTF-8?q?=E9=83=A8=E9=97=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Permission/DepartmentController.php       | 10 +--
 web/src/modules/base/api/department.ts        |  2 +-
 ...344\275\223\344\270\255\346\226\207].yaml" |  2 +
 .../department/data/getFormItems.tsx          |  4 ++
 .../department/data/getTableColumns.tsx       | 29 ++++++--
 .../views/permission/department/index.vue     |  6 ++
 .../base/views/permission/user/index.vue      | 69 ++++++++++---------
 7 files changed, 77 insertions(+), 45 deletions(-)

diff --git a/app/Http/Admin/Controller/Permission/DepartmentController.php b/app/Http/Admin/Controller/Permission/DepartmentController.php
index 57996ca84..1bb98a614 100644
--- a/app/Http/Admin/Controller/Permission/DepartmentController.php
+++ b/app/Http/Admin/Controller/Permission/DepartmentController.php
@@ -55,13 +55,9 @@ public function __construct(
     #[Permission(code: 'permission:department:index')]
     public function pageList(): Result
     {
-        return $this->success(
-            $this->service->page(
-                $this->getRequestData(),
-                $this->getCurrentPage(),
-                $this->getPageSize()
-            )
-        );
+        return $this->success([
+            'list' => $this->service->getList($this->getRequestData())
+        ]);
     }
 
     #[Post(
diff --git a/web/src/modules/base/api/department.ts b/web/src/modules/base/api/department.ts
index b16af828f..c099bc3a9 100644
--- a/web/src/modules/base/api/department.ts
+++ b/web/src/modules/base/api/department.ts
@@ -20,7 +20,7 @@ export interface DepartmentSearchVo {
 }
 
 export function page(data: DepartmentSearchVo): Promise<ResponseStruct<PageList<DepartmentVo>>> {
-  return useHttp().get('/admin/department/list', { params: data })
+  return useHttp().get('/admin/department/list?level=1', { params: data })
 }
 
 export function create(data: DepartmentVo): Promise<ResponseStruct<null>> {
diff --git "a/web/src/modules/base/locales/zh_CN[\347\256\200\344\275\223\344\270\255\346\226\207].yaml" "b/web/src/modules/base/locales/zh_CN[\347\256\200\344\275\223\344\270\255\346\226\207].yaml"
index 156329d82..0bb4e7eab 100644
--- "a/web/src/modules/base/locales/zh_CN[\347\256\200\344\275\223\344\270\255\346\226\207].yaml"
+++ "b/web/src/modules/base/locales/zh_CN[\347\256\200\344\275\223\344\270\255\346\226\207].yaml"
@@ -133,6 +133,8 @@ baseDepartment:
     mainTitle: 部门管理
     subTitle: 提供公司、机构的人员部门管理、以及部门负责人。
     setLeader: 设置负责人
+    manageUser: 管理用户
+    managePost: 管理岗位
   placeholder:
     name: 请输入部门名称
     parentDepartment: 请选择上级部门
diff --git a/web/src/modules/base/views/permission/department/data/getFormItems.tsx b/web/src/modules/base/views/permission/department/data/getFormItems.tsx
index aa1659b8d..e49b4e83b 100644
--- a/web/src/modules/base/views/permission/department/data/getFormItems.tsx
+++ b/web/src/modules/base/views/permission/department/data/getFormItems.tsx
@@ -13,6 +13,10 @@ export default function getFormItems(formType: 'add' | 'edit' = 'add', t: any):
   const treeSelectRef = ref()
   const deptList = ref([])
 
+  useHttp().get('/admin/department/list?level=1').then((res: any) => {
+    deptList.value = res.data.list
+  })
+
   return [
     {
       label: () => t('baseDepartment.parentDepartment'), prop: 'parent_id', render: () => (
diff --git a/web/src/modules/base/views/permission/department/data/getTableColumns.tsx b/web/src/modules/base/views/permission/department/data/getTableColumns.tsx
index 65e02732e..39e6e1847 100644
--- a/web/src/modules/base/views/permission/department/data/getTableColumns.tsx
+++ b/web/src/modules/base/views/permission/department/data/getTableColumns.tsx
@@ -26,17 +26,16 @@ export default function getTableColumns(dialog: UseDialogExpose, formRef: any, t
     // 多选列
     { type: 'selection', showOverflowTooltip: false, label: () => t('crud.selection') },
     // 普通列
-    { label: () => t('baseDepartment.name'), prop: 'name' },
-    { label: () => t('baseDepartment.created_at'), prop: 'created_at' },
-    { label: () => t('baseDepartment.updated_at'), prop: 'updated_at' },
+    { label: () => t('baseDepartment.name'), prop: 'name', align: 'left' },
+    { label: () => t('baseDepartment.created_at'), prop: 'created_at', width: 200 },
+    { label: () => t('baseDepartment.updated_at'), prop: 'updated_at', width: 200 },
 
     // 操作列
     {
       type: 'operation',
       label: () => t('crud.operation'),
-      width: '260px',
+      width: '180px',
       operationConfigure: {
-        type: 'tile',
         actions: [
           {
             name: 'setLeader',
@@ -48,6 +47,26 @@ export default function getTableColumns(dialog: UseDialogExpose, formRef: any, t
               dialog.open({ formType: 'setLeader', data: row })
             },
           },
+          {
+            name: 'manageUser',
+            icon: 'uil:users-alt',
+            show: () => showBtn('permission:department:update'),
+            text: () => t('baseDepartment.page.manageUser'),
+            onClick: ({ row }) => {
+              dialog.setTitle(t('baseDepartment.page.manageUser'))
+              dialog.open({ formType: 'manageUser', data: row })
+            },
+          },
+          {
+            name: 'managePost',
+            icon: 'material-symbols:position-bottom-right-outline-rounded',
+            show: () => showBtn('permission:department:update'),
+            text: () => t('baseDepartment.page.managePost'),
+            onClick: ({ row }) => {
+              dialog.setTitle(t('baseDepartment.page.managePost'))
+              dialog.open({ formType: 'managePost', data: row })
+            },
+          },
           {
             name: 'edit',
             icon: 'material-symbols:person-edit',
diff --git a/web/src/modules/base/views/permission/department/index.vue b/web/src/modules/base/views/permission/department/index.vue
index 4dc559359..e882fca19 100644
--- a/web/src/modules/base/views/permission/department/index.vue
+++ b/web/src/modules/base/views/permission/department/index.vue
@@ -94,6 +94,7 @@ const options = ref<MaProTableOptions>({
   },
   // 表格参数
   tableOptions: {
+    rowKey: 'id',
     on: {
       // 表格选择事件
       onSelectionChange: (selection: any[]) => selections.value = selection,
@@ -163,6 +164,11 @@ function handleDelete() {
         >
           {{ t('crud.delete') }}
         </el-button>
+        <div>
+          <el-button>
+            展开
+          </el-button>
+        </div>
       </template>
       <!-- 数据为空时 -->
       <template #empty>
diff --git a/web/src/modules/base/views/permission/user/index.vue b/web/src/modules/base/views/permission/user/index.vue
index b8932bb34..65538c930 100644
--- a/web/src/modules/base/views/permission/user/index.vue
+++ b/web/src/modules/base/views/permission/user/index.vue
@@ -138,35 +138,13 @@ function handleDelete() {
 </script>
 
 <template>
-  <div class="mine-layout pt-3">
-    <MaProTable ref="proTableRef" :options="options" :schema="schema">
-      <template #actions>
-        <el-button
-          v-auth="['permission:user:save']"
-          type="primary"
-          @click="() => {
-            maDialog.setTitle(t('crud.add'))
-            maDialog.open({ formType: 'add' })
-          }"
-        >
-          {{ t('crud.add') }}
-        </el-button>
-      </template>
-
-      <template #toolbarLeft>
-        <el-button
-          v-auth="['permission:user:delete']"
-          type="danger"
-          plain
-          :disabled="selections.length < 1"
-          @click="handleDelete"
-        >
-          {{ t('crud.delete') }}
-        </el-button>
-      </template>
-      <!-- 数据为空时 -->
-      <template #empty>
-        <el-empty>
+  <div class="mine-layout flex justify-between pb-0 pl-3 pt-3">
+    <div class="w-full rounded bg-[#fff] md:w-2/12">
+      asda
+    </div>
+    <div class="w-full md:w-10/12">
+      <MaProTable ref="proTableRef" :options="options" :schema="schema">
+        <template #actions>
           <el-button
             v-auth="['permission:user:save']"
             type="primary"
@@ -177,9 +155,36 @@ function handleDelete() {
           >
             {{ t('crud.add') }}
           </el-button>
-        </el-empty>
-      </template>
-    </MaProTable>
+        </template>
+
+        <template #toolbarLeft>
+          <el-button
+            v-auth="['permission:user:delete']"
+            type="danger"
+            plain
+            :disabled="selections.length < 1"
+            @click="handleDelete"
+          >
+            {{ t('crud.delete') }}
+          </el-button>
+        </template>
+        <!-- 数据为空时 -->
+        <template #empty>
+          <el-empty>
+            <el-button
+              v-auth="['permission:user:save']"
+              type="primary"
+              @click="() => {
+                maDialog.setTitle(t('crud.add'))
+                maDialog.open({ formType: 'add' })
+              }"
+            >
+              {{ t('crud.add') }}
+            </el-button>
+          </el-empty>
+        </template>
+      </MaProTable>
+    </div>
 
     <component :is="maDialog.Dialog">
       <template #default="{ formType, data }">

From c41a31beea3aee20a6c7b25c86104dbc1cdc6dd2 Mon Sep 17 00:00:00 2001
From: zds <49744633+zds-s@users.noreply.github.com>
Date: Tue, 11 Mar 2025 11:12:50 +0800
Subject: [PATCH 20/91] feat: implement data permission management with
 DataScope and related aspects

---
 .../Aspects/DataScopeAspect.php               | 81 +++++++++++++++++++
 .../DataPermission/Attribute/DataScope.php    | 12 +++
 app/Library/DataPermission/Manager.php        |  8 ++
 .../DataPermission/Scope/DataScope.php        | 26 ++++++
 app/Model/Permission/User.php                 | 23 ++++++
 5 files changed, 150 insertions(+)
 create mode 100644 app/Library/DataPermission/Aspects/DataScopeAspect.php
 create mode 100644 app/Library/DataPermission/Attribute/DataScope.php
 create mode 100644 app/Library/DataPermission/Manager.php
 create mode 100644 app/Library/DataPermission/Scope/DataScope.php

diff --git a/app/Library/DataPermission/Aspects/DataScopeAspect.php b/app/Library/DataPermission/Aspects/DataScopeAspect.php
new file mode 100644
index 000000000..457305426
--- /dev/null
+++ b/app/Library/DataPermission/Aspects/DataScopeAspect.php
@@ -0,0 +1,81 @@
+<?php
+
+namespace App\Library\DataPermission\Aspects;
+
+use App\Library\DataPermission\Attribute\DataScope;
+use Hyperf\Context\Context;
+use Hyperf\Database\Query\Builder;
+use Hyperf\Di\Annotation\Aspect;
+use Hyperf\Di\Aop\AbstractAspect;
+use Hyperf\Di\Aop\ProceedingJoinPoint;
+
+#[Aspect]
+final class DataScopeAspect extends AbstractAspect
+{
+
+    public const CONTEXT_KEY = 'data_permission';
+
+    public array $annotations = [
+        DataScope::class
+    ];
+
+    public array $classes = [
+        Builder::class.'::update',
+        Builder::class.'::delete',
+        Builder::class.'::runSelect',
+    ];
+
+    public function process(ProceedingJoinPoint $proceedingJoinPoint)
+    {
+        if (
+            isset($proceedingJoinPoint->getAnnotationMetadata()->class[DataScope::class]) ||
+            isset($proceedingJoinPoint->getAnnotationMetadata()->method[DataScope::class])
+        ){
+            return $this->handleDataScope($proceedingJoinPoint);
+        }
+
+        if ($proceedingJoinPoint->className === Builder::class){
+            if ($proceedingJoinPoint->methodName==='runSelect'){
+                return $this->handleSelect($proceedingJoinPoint);
+            }
+            if ($proceedingJoinPoint->methodName==='delete'){
+                return $this->handleDelete($proceedingJoinPoint);
+            }
+            if ($proceedingJoinPoint->methodName==='update'){
+               return $this->handleUpdate($proceedingJoinPoint);
+            }
+        }
+        return $proceedingJoinPoint->process();
+    }
+
+    protected function handleDelete(ProceedingJoinPoint $proceedingJoinPoint)
+    {
+        return $proceedingJoinPoint->process();
+    }
+
+    protected function handleUpdate(ProceedingJoinPoint $proceedingJoinPoint)
+    {
+        return $proceedingJoinPoint->process();
+    }
+
+    protected function handleSelect(ProceedingJoinPoint $proceedingJoinPoint)
+    {
+        /**
+         * @var Builder $builder
+         */
+        $builder = $proceedingJoinPoint->getInstance();
+        if (Context::has(self::CONTEXT_KEY)){
+            // todo 做数据权限处理
+        }
+        return $proceedingJoinPoint->process();
+    }
+
+
+    protected function handleDataScope(ProceedingJoinPoint $proceedingJoinPoint)
+    {
+        Context::set(self::CONTEXT_KEY, 1);
+        $result =  $proceedingJoinPoint->process();
+        Context::destroy(self::CONTEXT_KEY);
+        return $result;
+    }
+}
\ No newline at end of file
diff --git a/app/Library/DataPermission/Attribute/DataScope.php b/app/Library/DataPermission/Attribute/DataScope.php
new file mode 100644
index 000000000..48f527510
--- /dev/null
+++ b/app/Library/DataPermission/Attribute/DataScope.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace App\Library\DataPermission\Attribute;
+
+use Attribute;
+use Hyperf\Di\Annotation\AbstractAnnotation;
+
+#[Attribute(Attribute::TARGET_CLASS|Attribute::TARGET_METHOD)]
+final class DataScope extends AbstractAnnotation
+{
+
+}
\ No newline at end of file
diff --git a/app/Library/DataPermission/Manager.php b/app/Library/DataPermission/Manager.php
new file mode 100644
index 000000000..8ba96c6ae
--- /dev/null
+++ b/app/Library/DataPermission/Manager.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace App\Library\DataPermission;
+
+final class Manager
+{
+
+}
\ No newline at end of file
diff --git a/app/Library/DataPermission/Scope/DataScope.php b/app/Library/DataPermission/Scope/DataScope.php
new file mode 100644
index 000000000..5d2ecd8ac
--- /dev/null
+++ b/app/Library/DataPermission/Scope/DataScope.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace App\Library\DataPermission\Scope;
+
+use App\Http\CurrentUser;
+use Hyperf\Database\Model\Builder;
+use Hyperf\Database\Model\Model;
+use Hyperf\Database\Model\Scope;
+
+final class DataScope implements Scope
+{
+    public function __construct(
+        private readonly CurrentUser $currentUser
+    ){}
+
+    public function apply(Builder $builder, Model $model): void
+    {
+        if ($this->currentUser->user() === null){
+            return;
+        }
+        $user = $this->currentUser->user();
+        if ($user->isSuperAdmin()){
+            return;
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/Model/Permission/User.php b/app/Model/Permission/User.php
index 6b497af80..fa5f2ebc0 100644
--- a/app/Model/Permission/User.php
+++ b/app/Model/Permission/User.php
@@ -163,4 +163,27 @@ public function position(): BelongsToMany
     {
         return $this->belongsToMany(Position::class, 'user_position', 'user_id', 'position_id');
     }
+
+    public function getPolicy(): Policy|null
+    {
+        /**
+         * @var Policy|null $policy
+         */
+        $policy = $this->policy()->first();
+        if (!empty($policy)){
+            return $policy;
+        }
+
+        $this->load('roles');
+        $roleList = $this->roles;
+        foreach ($roleList as $role){
+            $current = $role->policy()->first();
+            if (!empty($current)){
+                return $current;
+            }
+        }
+
+        return null;
+
+    }
 }

From aea2d49cfc693c319fd14ddb90ed7771e018b998 Mon Sep 17 00:00:00 2001
From: zds <49744633+zds-s@users.noreply.github.com>
Date: Wed, 12 Mar 2025 09:14:12 +0800
Subject: [PATCH 21/91] feat: implement data permission rules and context
 management with caching support

---
 .../Permission/DepartmentController.php       |   2 +-
 .../Permission/PositionController.php         |   2 +-
 .../Request/Permission/PositionRequest.php    |   2 +-
 .../Aspects/DataScopeAspect.php               |  53 +++++---
 .../DataPermission/Attribute/DataScope.php    |  35 ++++-
 app/Library/DataPermission/Context.php        |  54 ++++++++
 app/Library/DataPermission/Factory.php        |  82 ++++++++++++
 app/Library/DataPermission/Manager.php        |  15 ++-
 .../DataPermission/Rule/CustomFuncFactory.php |  34 +++++
 .../Rule/Executable/AbstractExecutable.php    |  66 +++++++++
 .../Rule/Executable/CreatedByIdsExecute.php   | 125 ++++++++++++++++++
 .../Rule/Executable/DeptExecute.php           |  61 +++++++++
 app/Library/DataPermission/Rule/Rule.php      |  72 ++++++++++
 .../DataPermission/Scope/DataScope.php        |  26 ----
 app/Library/DataPermission/ScopeType.php      |  28 ++++
 app/Model/Permission/Department.php           |  20 ++-
 app/Model/Permission/User.php                 |  12 +-
 .../Permission/DepartmentRepository.php       |  10 ++
 .../Permission/PositionRepository.php         |   2 +-
 app/Schema/PositionSchema.php                 |   3 +-
 app/Service/Permission/PositionService.php    |   2 +-
 config/autoload/casbin/rbac-model.conf        |  14 --
 config/autoload/department/cache.php          |  21 +++
 web/src/modules/base/locales/en[English].yaml |   4 +-
 24 files changed, 664 insertions(+), 81 deletions(-)
 create mode 100644 app/Library/DataPermission/Context.php
 create mode 100644 app/Library/DataPermission/Factory.php
 create mode 100644 app/Library/DataPermission/Rule/CustomFuncFactory.php
 create mode 100644 app/Library/DataPermission/Rule/Executable/AbstractExecutable.php
 create mode 100644 app/Library/DataPermission/Rule/Executable/CreatedByIdsExecute.php
 create mode 100644 app/Library/DataPermission/Rule/Executable/DeptExecute.php
 create mode 100644 app/Library/DataPermission/Rule/Rule.php
 delete mode 100644 app/Library/DataPermission/Scope/DataScope.php
 create mode 100644 app/Library/DataPermission/ScopeType.php
 delete mode 100644 config/autoload/casbin/rbac-model.conf
 create mode 100644 config/autoload/department/cache.php

diff --git a/app/Http/Admin/Controller/Permission/DepartmentController.php b/app/Http/Admin/Controller/Permission/DepartmentController.php
index 1bb98a614..47fd80ab1 100644
--- a/app/Http/Admin/Controller/Permission/DepartmentController.php
+++ b/app/Http/Admin/Controller/Permission/DepartmentController.php
@@ -56,7 +56,7 @@ public function __construct(
     public function pageList(): Result
     {
         return $this->success([
-            'list' => $this->service->getList($this->getRequestData())
+            'list' => $this->service->getList($this->getRequestData()),
         ]);
     }
 
diff --git a/app/Http/Admin/Controller/Permission/PositionController.php b/app/Http/Admin/Controller/Permission/PositionController.php
index 002835e4e..613d56763 100644
--- a/app/Http/Admin/Controller/Permission/PositionController.php
+++ b/app/Http/Admin/Controller/Permission/PositionController.php
@@ -118,4 +118,4 @@ public function delete(): Result
         $this->service->deleteById($this->getRequestData());
         return $this->success();
     }
-} 
\ No newline at end of file
+}
diff --git a/app/Http/Admin/Request/Permission/PositionRequest.php b/app/Http/Admin/Request/Permission/PositionRequest.php
index 6a059eb5f..e40b6b69e 100644
--- a/app/Http/Admin/Request/Permission/PositionRequest.php
+++ b/app/Http/Admin/Request/Permission/PositionRequest.php
@@ -55,4 +55,4 @@ public function attributes(): array
             'dept_id' => '部门ID',
         ];
     }
-} 
\ No newline at end of file
+}
diff --git a/app/Library/DataPermission/Aspects/DataScopeAspect.php b/app/Library/DataPermission/Aspects/DataScopeAspect.php
index 457305426..998b01ed1 100644
--- a/app/Library/DataPermission/Aspects/DataScopeAspect.php
+++ b/app/Library/DataPermission/Aspects/DataScopeAspect.php
@@ -1,8 +1,19 @@
 <?php
 
+declare(strict_types=1);
+/**
+ * This file is part of MineAdmin.
+ *
+ * @link     https://www.mineadmin.com
+ * @document https://doc.mineadmin.com
+ * @contact  root@imoi.cn
+ * @license  https://github.com/mineadmin/MineAdmin/blob/master/LICENSE
+ */
+
 namespace App\Library\DataPermission\Aspects;
 
 use App\Library\DataPermission\Attribute\DataScope;
+use App\Library\DataPermission\Context as DataPermissionContext;
 use Hyperf\Context\Context;
 use Hyperf\Database\Query\Builder;
 use Hyperf\Di\Annotation\Aspect;
@@ -12,37 +23,36 @@
 #[Aspect]
 final class DataScopeAspect extends AbstractAspect
 {
-
     public const CONTEXT_KEY = 'data_permission';
 
     public array $annotations = [
-        DataScope::class
+        DataScope::class,
     ];
 
     public array $classes = [
-        Builder::class.'::update',
-        Builder::class.'::delete',
-        Builder::class.'::runSelect',
+        Builder::class . '::update',
+        Builder::class . '::delete',
+        Builder::class . '::runSelect',
     ];
 
     public function process(ProceedingJoinPoint $proceedingJoinPoint)
     {
         if (
-            isset($proceedingJoinPoint->getAnnotationMetadata()->class[DataScope::class]) ||
-            isset($proceedingJoinPoint->getAnnotationMetadata()->method[DataScope::class])
-        ){
+            isset($proceedingJoinPoint->getAnnotationMetadata()->class[DataScope::class])
+            || isset($proceedingJoinPoint->getAnnotationMetadata()->method[DataScope::class])
+        ) {
             return $this->handleDataScope($proceedingJoinPoint);
         }
 
-        if ($proceedingJoinPoint->className === Builder::class){
-            if ($proceedingJoinPoint->methodName==='runSelect'){
+        if ($proceedingJoinPoint->className === Builder::class) {
+            if ($proceedingJoinPoint->methodName === 'runSelect') {
                 return $this->handleSelect($proceedingJoinPoint);
             }
-            if ($proceedingJoinPoint->methodName==='delete'){
+            if ($proceedingJoinPoint->methodName === 'delete') {
                 return $this->handleDelete($proceedingJoinPoint);
             }
-            if ($proceedingJoinPoint->methodName==='update'){
-               return $this->handleUpdate($proceedingJoinPoint);
+            if ($proceedingJoinPoint->methodName === 'update') {
+                return $this->handleUpdate($proceedingJoinPoint);
             }
         }
         return $proceedingJoinPoint->process();
@@ -64,18 +74,27 @@ protected function handleSelect(ProceedingJoinPoint $proceedingJoinPoint)
          * @var Builder $builder
          */
         $builder = $proceedingJoinPoint->getInstance();
-        if (Context::has(self::CONTEXT_KEY)){
+        if (Context::has(self::CONTEXT_KEY)) {
             // todo 做数据权限处理
         }
         return $proceedingJoinPoint->process();
     }
 
-
     protected function handleDataScope(ProceedingJoinPoint $proceedingJoinPoint)
     {
         Context::set(self::CONTEXT_KEY, 1);
-        $result =  $proceedingJoinPoint->process();
+        /**
+         * @var DataScope $attribute
+         */
+        $attribute = $proceedingJoinPoint->getAnnotationMetadata()->class[DataScope::class];
+        if ($attribute === null) {
+            $attribute = $proceedingJoinPoint->getAnnotationMetadata()->method[DataScope::class];
+        }
+        DataPermissionContext::setDeptColumn($attribute->getDeptColumn());
+        DataPermissionContext::setCreatedByColumn($attribute->getCreatedByColumn());
+        DataPermissionContext::setScopeType($attribute->getScopeType());
+        $result = $proceedingJoinPoint->process();
         Context::destroy(self::CONTEXT_KEY);
         return $result;
     }
-}
\ No newline at end of file
+}
diff --git a/app/Library/DataPermission/Attribute/DataScope.php b/app/Library/DataPermission/Attribute/DataScope.php
index 48f527510..9d239677d 100644
--- a/app/Library/DataPermission/Attribute/DataScope.php
+++ b/app/Library/DataPermission/Attribute/DataScope.php
@@ -1,12 +1,41 @@
 <?php
 
+declare(strict_types=1);
+/**
+ * This file is part of MineAdmin.
+ *
+ * @link     https://www.mineadmin.com
+ * @document https://doc.mineadmin.com
+ * @contact  root@imoi.cn
+ * @license  https://github.com/mineadmin/MineAdmin/blob/master/LICENSE
+ */
+
 namespace App\Library\DataPermission\Attribute;
 
-use Attribute;
+use App\Library\DataPermission\ScopeType;
 use Hyperf\Di\Annotation\AbstractAnnotation;
 
-#[Attribute(Attribute::TARGET_CLASS|Attribute::TARGET_METHOD)]
+#[\Attribute(\Attribute::TARGET_CLASS | \Attribute::TARGET_METHOD)]
 final class DataScope extends AbstractAnnotation
 {
+    public function __construct(
+        private readonly string $deptColumn = 'dept_id',
+        private readonly string $createdByColumn = 'created_by',
+        private readonly ScopeType $scopeType = ScopeType::DEPT_CREATED_BY,
+    ) {}
+
+    public function getDeptColumn(): string
+    {
+        return $this->deptColumn;
+    }
+
+    public function getCreatedByColumn(): string
+    {
+        return $this->createdByColumn;
+    }
 
-}
\ No newline at end of file
+    public function getScopeType(): ScopeType
+    {
+        return $this->scopeType;
+    }
+}
diff --git a/app/Library/DataPermission/Context.php b/app/Library/DataPermission/Context.php
new file mode 100644
index 000000000..955bcf5e2
--- /dev/null
+++ b/app/Library/DataPermission/Context.php
@@ -0,0 +1,54 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * This file is part of MineAdmin.
+ *
+ * @link     https://www.mineadmin.com
+ * @document https://doc.mineadmin.com
+ * @contact  root@imoi.cn
+ * @license  https://github.com/mineadmin/MineAdmin/blob/master/LICENSE
+ */
+
+namespace App\Library\DataPermission;
+
+use Hyperf\Context\Context as Ctx;
+
+final class Context
+{
+    private const DEPT_COLUMN_KEY = 'data_permission_dept_column';
+
+    private const CREATED_BY_COLUMN_KEY = 'data_permission_created_by_column';
+
+    private const SCOPE_TYPE_KEY = 'data_permission_scope_type';
+
+    public static function getDeptColumn(): string
+    {
+        return Ctx::get(self::DEPT_COLUMN_KEY, 'dept_id');
+    }
+
+    public static function setDeptColumn(string $column = 'dept_id'): void
+    {
+        Ctx::set(self::DEPT_COLUMN_KEY, $column);
+    }
+
+    public static function getCreatedByColumn(): string
+    {
+        return Ctx::get(self::CREATED_BY_COLUMN_KEY, 'created_by');
+    }
+
+    public static function setCreatedByColumn(string $column = 'created_by'): void
+    {
+        Ctx::set(self::CREATED_BY_COLUMN_KEY, $column);
+    }
+
+    public static function setScopeType(ScopeType $scopeType): void
+    {
+        Ctx::set(self::SCOPE_TYPE_KEY, $scopeType);
+    }
+
+    public static function getScopeType(): ScopeType
+    {
+        return Ctx::get(self::SCOPE_TYPE_KEY, ScopeType::DEPT_CREATED_BY);
+    }
+}
diff --git a/app/Library/DataPermission/Factory.php b/app/Library/DataPermission/Factory.php
new file mode 100644
index 000000000..24e85ad3b
--- /dev/null
+++ b/app/Library/DataPermission/Factory.php
@@ -0,0 +1,82 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * This file is part of MineAdmin.
+ *
+ * @link     https://www.mineadmin.com
+ * @document https://doc.mineadmin.com
+ * @contact  root@imoi.cn
+ * @license  https://github.com/mineadmin/MineAdmin/blob/master/LICENSE
+ */
+
+namespace App\Library\DataPermission;
+
+use App\Library\DataPermission\Rule\Rule;
+use App\Model\DataPermission\Policy;
+use App\Model\Permission\User;
+use Hyperf\Database\Query\Builder;
+
+final class Factory
+{
+    public function __construct(
+        private readonly Rule $rule
+    ) {}
+
+    public function build(
+        Builder $builder,
+        User $user,
+    ): void {
+        if ($user->isSuperAdmin()) {
+            return;
+        }
+        if (($policy = $user->getPolicy()) === null) {
+            return;
+        }
+        $scopeType = Context::getScopeType();
+        switch ($scopeType) {
+            case ScopeType::CREATED_BY:
+                self::handleCreatedBy($user, $policy, $builder);
+                break;
+            case ScopeType::DEPT:
+                self::handleDept($user, $policy, $builder);
+                break;
+            case ScopeType::DEPT_CREATED_BY:
+                self::handleDeptCreatedBy($user, $policy, $builder);
+                break;
+            case ScopeType::DEPT_OR_CREATED_BY:
+                self::handleDeptOrCreatedBy($user, $policy, $builder);
+                break;
+        }
+    }
+
+    private function handleCreatedBy(User $user, Policy $policy, Builder $builder): void
+    {
+        $createdByList = $this->rule->getCreatedByList($user, $policy);
+        $builder->whereIn(Context::getCreatedByColumn(), $createdByList);
+    }
+
+    private function handleDept(User $user, Policy $policy, Builder $builder): void
+    {
+        $deptList = $this->rule->getDeptIds($user, $policy);
+        $builder->whereIn(Context::getDeptColumn(), $deptList);
+    }
+
+    private function handleDeptCreatedBy(User $user, Policy $policy, Builder $builder): void
+    {
+        $createdByList = $this->rule->getCreatedByList($user, $policy);
+        $deptList = $this->rule->getDeptIds($user, $policy);
+        $builder->whereIn(Context::getCreatedByColumn(), $createdByList)
+            ->whereIn(Context::getDeptColumn(), $deptList);
+    }
+
+    private function handleDeptOrCreatedBy(User $user, Policy $policy, Builder $builder): void
+    {
+        $createdByList = $this->rule->getCreatedByList($user, $policy);
+        $deptList = $this->rule->getDeptIds($user, $policy);
+        $builder->where(static function (Builder $query) use ($createdByList, $deptList) {
+            $query->whereIn(Context::getCreatedByColumn(), $createdByList)
+                ->orWhereIn(Context::getDeptColumn(), $deptList);
+        });
+    }
+}
diff --git a/app/Library/DataPermission/Manager.php b/app/Library/DataPermission/Manager.php
index 8ba96c6ae..a04ab05d6 100644
--- a/app/Library/DataPermission/Manager.php
+++ b/app/Library/DataPermission/Manager.php
@@ -1,8 +1,15 @@
 <?php
 
-namespace App\Library\DataPermission;
+declare(strict_types=1);
+/**
+ * This file is part of MineAdmin.
+ *
+ * @link     https://www.mineadmin.com
+ * @document https://doc.mineadmin.com
+ * @contact  root@imoi.cn
+ * @license  https://github.com/mineadmin/MineAdmin/blob/master/LICENSE
+ */
 
-final class Manager
-{
+namespace App\Library\DataPermission;
 
-}
\ No newline at end of file
+final class Manager {}
diff --git a/app/Library/DataPermission/Rule/CustomFuncFactory.php b/app/Library/DataPermission/Rule/CustomFuncFactory.php
new file mode 100644
index 000000000..5ab18eedd
--- /dev/null
+++ b/app/Library/DataPermission/Rule/CustomFuncFactory.php
@@ -0,0 +1,34 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * This file is part of MineAdmin.
+ *
+ * @link     https://www.mineadmin.com
+ * @document https://doc.mineadmin.com
+ * @contact  root@imoi.cn
+ * @license  https://github.com/mineadmin/MineAdmin/blob/master/LICENSE
+ */
+
+namespace App\Library\DataPermission\Rule;
+
+final class CustomFuncFactory
+{
+    /**
+     * @var array<string,\Closure>
+     */
+    private static array $customFunc = [];
+
+    public static function registerCustomFunc(string $name, \Closure $func): void
+    {
+        self::$customFunc[$name] = $func;
+    }
+
+    public static function getCustomFunc(string $name): \Closure
+    {
+        if (isset(self::$customFunc[$name])) {
+            return self::$customFunc[$name];
+        }
+        throw new \RuntimeException('Custom func not found');
+    }
+}
diff --git a/app/Library/DataPermission/Rule/Executable/AbstractExecutable.php b/app/Library/DataPermission/Rule/Executable/AbstractExecutable.php
new file mode 100644
index 000000000..7e9648b42
--- /dev/null
+++ b/app/Library/DataPermission/Rule/Executable/AbstractExecutable.php
@@ -0,0 +1,66 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * This file is part of MineAdmin.
+ *
+ * @link     https://www.mineadmin.com
+ * @document https://doc.mineadmin.com
+ * @contact  root@imoi.cn
+ * @license  https://github.com/mineadmin/MineAdmin/blob/master/LICENSE
+ */
+
+namespace App\Library\DataPermission\Rule\Executable;
+
+use App\Library\DataPermission\Rule\CustomFuncFactory;
+use App\Model\DataPermission\Policy;
+use App\Model\Permission\Department;
+use App\Model\Permission\User;
+use Hyperf\Collection\Collection;
+use Hyperf\Context\ApplicationContext;
+use Psr\Container\ContainerExceptionInterface;
+use Psr\Container\NotFoundExceptionInterface;
+
+abstract class AbstractExecutable
+{
+    public function __construct(
+        private readonly User $user,
+        private readonly Policy $policy
+    ) {}
+
+    abstract public function execute(): ?array;
+
+    /**
+     * @template T
+     * @param class-string<T> $className
+     * @return T
+     * @throws ContainerExceptionInterface
+     * @throws NotFoundExceptionInterface
+     */
+    protected function getRepository(string $className): mixed
+    {
+        return ApplicationContext::getContainer()->get($className);
+    }
+
+    protected function getUser(): User
+    {
+        return $this->user;
+    }
+
+    protected function getPolicy(): Policy
+    {
+        return $this->policy;
+    }
+
+    /**
+     * @return Collection<int,Department>
+     */
+    protected function loadCustomFunc(Policy $policy): Collection
+    {
+        $result = CustomFuncFactory::getCustomFunc($policy->value[0])->call($this, $this->getUser(), $this->getPolicy());
+        if ($result instanceof Collection) {
+            return $result;
+        }
+        throw new \RuntimeException('Custom func must return Collection');
+    }
+}
diff --git a/app/Library/DataPermission/Rule/Executable/CreatedByIdsExecute.php b/app/Library/DataPermission/Rule/Executable/CreatedByIdsExecute.php
new file mode 100644
index 000000000..aca5b779a
--- /dev/null
+++ b/app/Library/DataPermission/Rule/Executable/CreatedByIdsExecute.php
@@ -0,0 +1,125 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * This file is part of MineAdmin.
+ *
+ * @link     https://www.mineadmin.com
+ * @document https://doc.mineadmin.com
+ * @contact  root@imoi.cn
+ * @license  https://github.com/mineadmin/MineAdmin/blob/master/LICENSE
+ */
+
+namespace App\Library\DataPermission\Rule\Executable;
+
+use App\Model\Permission\Department;
+use App\Model\Permission\Position;
+use App\Model\Permission\User;
+use App\Repository\Permission\DepartmentRepository;
+use Hyperf\Database\Model\Collection;
+
+final class CreatedByIdsExecute extends AbstractExecutable
+{
+    public function execute(): ?array
+    {
+        $policy = $this->getPolicy();
+        $policyType = $policy->policy_type;
+        if ($policyType->isAll()) {
+            return null;
+        }
+        /*
+         * @var Department[]|Collection $departmentList
+         */
+        if ($policyType->isCustomDept()) {
+            $departmentList = $this->getRepository(DepartmentRepository::class)->getByIds($policy->value);
+        }
+        if ($policyType->isDeptSelf()) {
+            $departmentList = $this->getUser()->department()->get();
+        }
+        if ($policyType->isDeptTree()) {
+            $departmentList = collect();
+            /**
+             * @var Collection|Department[] $currentList
+             */
+            $currentList = $this->getUser()->department()->get();
+            foreach ($currentList as $item) {
+                $departmentList->merge($item->getFlatChildren());
+            }
+        }
+        if ($policyType->isCustomFunc()) {
+            $departmentList = $this->loadCustomFunc($policy);
+        }
+        $ids = [
+            $this->getUser()->id,
+        ];
+        foreach ($departmentList as $department) {
+            if ($policyType->isSelf()) {
+                break;
+            }
+            $this->getUser()->newQuery()
+                ->whereHas('department', static function ($query) use ($department) {
+                    $query->whereIn('id', $department->id);
+                })->get()->each(static function (User $user) use (&$ids) {
+                    $ids[] = $user->id;
+                });
+        }
+        if ($policyType->isNotCustomFunc() && $policyType->isNotCustomDept()) {
+            /**
+             * @var Collection|Department[] $leaderDepartmentList
+             */
+            $leaderDepartmentList = $this->getUser()->department()->get();
+            foreach ($leaderDepartmentList as $department) {
+                if ($policyType->isSelf() || $policyType->isDeptSelf()) {
+                    $this->getUser()->newQuery()
+                        ->whereHas('department', static function ($query) use ($department) {
+                            $query->whereIn('id', $department->id);
+                        })->get()->each(static function (User $user) use (&$ids) {
+                            $ids[] = $user->id;
+                        });
+                }
+                if ($policyType->isDeptTree()) {
+                    $department->getFlatChildren()->each(function (Department $department) use (&$ids) {
+                        $this->getUser()->newQuery()
+                            ->whereHas('department', static function ($query) use ($department) {
+                                $query->whereIn('id', $department->id);
+                            })->get()->each(static function (User $user) use (&$ids) {
+                                $ids[] = $user->id;
+                            });
+                    });
+                }
+            }
+            /**
+             * @var Collection|Position[] $positionList
+             */
+            $positionList = $this->getUser()->position()->get();
+            foreach ($positionList as $position) {
+                if ($policyType->isSelf()) {
+                    break;
+                }
+                if ($policyType->isDeptSelf()) {
+                    $position->department()->get()->each(function (Department $department) use (&$ids) {
+                        $this->getUser()->newQuery()
+                            ->whereHas('department', static function ($query) use ($department) {
+                                $query->whereIn('id', $department->id);
+                            })->get()->each(static function (User $user) use (&$ids) {
+                                $ids[] = $user->id;
+                            });
+                    });
+                }
+                if ($policyType->isDeptTree()) {
+                    $position->department()->get()->each(function (Department $department) use (&$ids) {
+                        $department->getFlatChildren()->each(function (Department $department) use (&$ids) {
+                            $this->getUser()->newQuery()
+                                ->whereHas('department', static function ($query) use ($department) {
+                                    $query->whereIn('id', $department->id);
+                                })->get()->each(static function (User $user) use (&$ids) {
+                                    $ids[] = $user->id;
+                                });
+                        });
+                    });
+                }
+            }
+        }
+        return $ids;
+    }
+}
diff --git a/app/Library/DataPermission/Rule/Executable/DeptExecute.php b/app/Library/DataPermission/Rule/Executable/DeptExecute.php
new file mode 100644
index 000000000..fa1e7b9ac
--- /dev/null
+++ b/app/Library/DataPermission/Rule/Executable/DeptExecute.php
@@ -0,0 +1,61 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * This file is part of MineAdmin.
+ *
+ * @link     https://www.mineadmin.com
+ * @document https://doc.mineadmin.com
+ * @contact  root@imoi.cn
+ * @license  https://github.com/mineadmin/MineAdmin/blob/master/LICENSE
+ */
+
+namespace App\Library\DataPermission\Rule\Executable;
+
+use App\Model\Permission\Department;
+use App\Model\Permission\Position;
+use App\Repository\Permission\DepartmentRepository;
+use Hyperf\Database\Model\Collection;
+
+final class DeptExecute extends AbstractExecutable
+{
+    public function execute(): ?array
+    {
+        $policy = $this->getPolicy();
+        $policyType = $policy->policy_type;
+        if ($policyType->isAll()) {
+            return null;
+        }
+        /*
+         * @var Department[]|Collection $departmentList
+         */
+        if ($policyType->isCustomDept()) {
+            $departmentList = $this->getRepository(DepartmentRepository::class)->getByIds($policy->value);
+        }
+        if ($policyType->isCustomFunc()) {
+            $departmentList = $this->loadCustomFunc($policy);
+        }
+        if ($policyType->isDeptSelf() || $policyType->isSelf()) {
+            $departmentList = $this->getUser()->department()->get();
+        }
+        if ($policyType->isDeptTree()) {
+            $departmentList = collect();
+            /**
+             * @var Collection|Department[] $currentList
+             */
+            $currentList = $this->getUser()->department()->get();
+            foreach ($currentList as $item) {
+                $departmentList->merge($item->getFlatChildren());
+            }
+        }
+        $departmentList->merge($this->getUser()->dept_leader()->get());
+        /**
+         * @var Collection|Position[] $positionList
+         */
+        $positionList = $this->getUser()->position()->get();
+        foreach ($positionList as $position) {
+            $departmentList->merge($position->department()->get());
+        }
+        return $departmentList->pluck('id')->toArray();
+    }
+}
diff --git a/app/Library/DataPermission/Rule/Rule.php b/app/Library/DataPermission/Rule/Rule.php
new file mode 100644
index 000000000..e4f7540da
--- /dev/null
+++ b/app/Library/DataPermission/Rule/Rule.php
@@ -0,0 +1,72 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * This file is part of MineAdmin.
+ *
+ * @link     https://www.mineadmin.com
+ * @document https://doc.mineadmin.com
+ * @contact  root@imoi.cn
+ * @license  https://github.com/mineadmin/MineAdmin/blob/master/LICENSE
+ */
+
+namespace App\Library\DataPermission\Rule;
+
+use App\Library\DataPermission\Rule\Executable\CreatedByIdsExecute;
+use App\Library\DataPermission\Rule\Executable\DeptExecute;
+use App\Model\DataPermission\Policy;
+use App\Model\Permission\User;
+use Hyperf\Cache\CacheManager;
+use Hyperf\Contract\ConfigInterface;
+use Psr\SimpleCache\CacheInterface;
+
+final class Rule
+{
+    private readonly CacheInterface $cache;
+
+    public function __construct(
+        private readonly ConfigInterface $config,
+        private readonly CacheManager $cacheManager
+    ) {
+        $this->cache = $this->cacheManager->getDriver($this->config->get('department.cache.driver'));
+    }
+
+    public function isCache(): bool
+    {
+        return (bool) $this->config->get('department.cache.enable');
+    }
+
+    public function getTtl(): mixed
+    {
+        return $this->config->get('department.cache.ttl');
+    }
+
+    public function getPrefix(): string
+    {
+        return $this->config->get('department.cache.prefix');
+    }
+
+    public function getDeptIds(User $user, Policy $policy): array
+    {
+        $cacheKey = $this->getPrefix() . ':deptIds:' . $user->id;
+        if ($this->isCache() && $this->cache->has($cacheKey)) {
+            return $this->cache->get($cacheKey);
+        }
+        $execute = new DeptExecute($user, $policy);
+        $result = $execute->execute();
+        $this->cache->set($cacheKey, $result, $this->getTtl());
+        return $result;
+    }
+
+    public function getCreatedByList(User $user, Policy $policy): array
+    {
+        $cacheKey = $this->getPrefix() . ':createdBy:' . $user->id;
+        if ($this->isCache() && $this->cache->has($cacheKey)) {
+            return $this->cache->get($cacheKey);
+        }
+        $execute = new CreatedByIdsExecute($user, $policy);
+        $result = $execute->execute();
+        $this->cache->set($cacheKey, $result, $this->getTtl());
+        return $result;
+    }
+}
diff --git a/app/Library/DataPermission/Scope/DataScope.php b/app/Library/DataPermission/Scope/DataScope.php
deleted file mode 100644
index 5d2ecd8ac..000000000
--- a/app/Library/DataPermission/Scope/DataScope.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-namespace App\Library\DataPermission\Scope;
-
-use App\Http\CurrentUser;
-use Hyperf\Database\Model\Builder;
-use Hyperf\Database\Model\Model;
-use Hyperf\Database\Model\Scope;
-
-final class DataScope implements Scope
-{
-    public function __construct(
-        private readonly CurrentUser $currentUser
-    ){}
-
-    public function apply(Builder $builder, Model $model): void
-    {
-        if ($this->currentUser->user() === null){
-            return;
-        }
-        $user = $this->currentUser->user();
-        if ($user->isSuperAdmin()){
-            return;
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/Library/DataPermission/ScopeType.php b/app/Library/DataPermission/ScopeType.php
new file mode 100644
index 000000000..61b873989
--- /dev/null
+++ b/app/Library/DataPermission/ScopeType.php
@@ -0,0 +1,28 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * This file is part of MineAdmin.
+ *
+ * @link     https://www.mineadmin.com
+ * @document https://doc.mineadmin.com
+ * @contact  root@imoi.cn
+ * @license  https://github.com/mineadmin/MineAdmin/blob/master/LICENSE
+ */
+
+namespace App\Library\DataPermission;
+
+enum ScopeType: int
+{
+    // 只根据部门过滤
+    case DEPT = 1;
+
+    // 只根据创建人过滤
+    case CREATED_BY = 2;
+
+    // 根据部门 and 创建人过滤
+    case DEPT_CREATED_BY = 3;
+
+    // 根据部门 or 创建人过滤
+    case DEPT_OR_CREATED_BY = 4;
+}
diff --git a/app/Model/Permission/Department.php b/app/Model/Permission/Department.php
index 44c56798a..1b008c0f6 100644
--- a/app/Model/Permission/Department.php
+++ b/app/Model/Permission/Department.php
@@ -13,6 +13,7 @@
 namespace App\Model\Permission;
 
 use Carbon\Carbon;
+use Hyperf\Collection\Collection as BaseCollection;
 use Hyperf\Database\Model\Collection;
 use Hyperf\Database\Model\Events\Deleted;
 use Hyperf\Database\Model\Relations\BelongsToMany;
@@ -30,6 +31,7 @@
  * @property Collection<int,Position>|Position[] $positions 岗位
  * @property Collection<int,User>|User[] $department_users 部门用户
  * @property Collection<int,User>|User[] $leader 部门领导
+ * @property Collection<int,Department>|Department[] $children 子部门
  */
 class Department extends Model
 {
@@ -74,6 +76,22 @@ public function leader(): BelongsToMany
 
     public function children(): HasMany
     {
-        return $this->hasMany(self::class, 'parent_id', 'id');
+        return $this->hasMany(self::class, 'parent_id', 'id')->with('children');
+    }
+
+    public function getFlatChildren(): BaseCollection
+    {
+        $flat = collect();
+        $this->load('children'); // 预加载子部门
+        $traverse = static function ($departments) use (&$traverse, $flat) {
+            foreach ($departments as $department) {
+                $flat->push($department);
+                if ($department->children->isNotEmpty()) {
+                    $traverse($department->children);
+                }
+            }
+        };
+        $traverse($this->children);
+        return $flat->prepend($this); // 包含自身
     }
 }
diff --git a/app/Model/Permission/User.php b/app/Model/Permission/User.php
index fa5f2ebc0..4cb9106b7 100644
--- a/app/Model/Permission/User.php
+++ b/app/Model/Permission/User.php
@@ -164,26 +164,24 @@ public function position(): BelongsToMany
         return $this->belongsToMany(Position::class, 'user_position', 'user_id', 'position_id');
     }
 
-    public function getPolicy(): Policy|null
+    public function getPolicy(): ?Policy
     {
         /**
-         * @var Policy|null $policy
+         * @var null|Policy $policy
          */
         $policy = $this->policy()->first();
-        if (!empty($policy)){
+        if (! empty($policy)) {
             return $policy;
         }
 
         $this->load('roles');
         $roleList = $this->roles;
-        foreach ($roleList as $role){
+        foreach ($roleList as $role) {
             $current = $role->policy()->first();
-            if (!empty($current)){
+            if (! empty($current)) {
                 return $current;
             }
         }
-
         return null;
-
     }
 }
diff --git a/app/Repository/Permission/DepartmentRepository.php b/app/Repository/Permission/DepartmentRepository.php
index bdf303027..83368ce37 100644
--- a/app/Repository/Permission/DepartmentRepository.php
+++ b/app/Repository/Permission/DepartmentRepository.php
@@ -14,6 +14,8 @@
 
 use App\Model\Permission\Department;
 use App\Repository\IRepository;
+use Hyperf\Collection\Arr;
+use Hyperf\Collection\Collection;
 use Hyperf\Database\Model\Builder;
 
 /**
@@ -25,9 +27,17 @@ public function __construct(
         protected readonly Department $model
     ) {}
 
+    public function getByIds(array $ids): Collection
+    {
+        return $this->model->whereIn('id', $ids)->get();
+    }
+
     public function handleSearch(Builder $query, array $params): Builder
     {
         return $query
+            ->when(isset($params['id']), static function (Builder $query) use ($params) {
+                $query->whereIn('id', Arr::wrap($params['id']));
+            })
             ->when(isset($params['name']), static function (Builder $query) use ($params) {
                 $query->where('name', 'like', '%' . $params['name'] . '%');
             })
diff --git a/app/Repository/Permission/PositionRepository.php b/app/Repository/Permission/PositionRepository.php
index 2b0cd4aec..71a6b87d5 100644
--- a/app/Repository/Permission/PositionRepository.php
+++ b/app/Repository/Permission/PositionRepository.php
@@ -42,4 +42,4 @@ public function handleSearch(Builder $query, array $params): Builder
             })
             ->with(['department']);
     }
-} 
\ No newline at end of file
+}
diff --git a/app/Schema/PositionSchema.php b/app/Schema/PositionSchema.php
index 668a2699c..de178c639 100644
--- a/app/Schema/PositionSchema.php
+++ b/app/Schema/PositionSchema.php
@@ -12,7 +12,6 @@
 
 namespace App\Schema;
 
-use Hyperf\Swagger\Annotation\Items;
 use Hyperf\Swagger\Annotation\Property;
 use Hyperf\Swagger\Annotation\Schema;
 
@@ -47,4 +46,4 @@ public function jsonSerialize(): mixed
     {
         return [];
     }
-} 
\ No newline at end of file
+}
diff --git a/app/Service/Permission/PositionService.php b/app/Service/Permission/PositionService.php
index f975cecc3..1f6d46b9f 100644
--- a/app/Service/Permission/PositionService.php
+++ b/app/Service/Permission/PositionService.php
@@ -24,4 +24,4 @@ class PositionService extends IService
     public function __construct(
         protected readonly PositionRepository $repository
     ) {}
-} 
\ No newline at end of file
+}
diff --git a/config/autoload/casbin/rbac-model.conf b/config/autoload/casbin/rbac-model.conf
deleted file mode 100644
index 7854845e4..000000000
--- a/config/autoload/casbin/rbac-model.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-[request_definition]
-r = sub, obj, act
-
-[policy_definition]
-p = sub, obj, act
-
-[role_definition]
-g = _, _
-
-[policy_effect]
-e = some(where (p.eft == allow))
-
-[matchers]
-m = g(r.sub, p.sub) && r.obj == p.obj && r.act == p.act || r.sub == "SuperAdmin"
\ No newline at end of file
diff --git a/config/autoload/department/cache.php b/config/autoload/department/cache.php
new file mode 100644
index 000000000..16abc2b3a
--- /dev/null
+++ b/config/autoload/department/cache.php
@@ -0,0 +1,21 @@
+<?php
+
+return [
+    /**
+     * 每次组装数据权限时，都会重新查询数据库，这样可以保证数据权限的实时性，但是会增加数据库的压力
+     * 如果你的数据权限不会频繁变动，可以开启缓存，缓存时间可以根据实际情况设置
+     */
+    'enable'    =>  env('DATA_PERMISSION_CACHE_ENABLE',false),
+    /**
+     * 缓存时间，单位秒
+     */
+    'ttl'       =>  env('DATA_PERMISSION_CACHE_TTL',60 * 5),
+    /**
+     * 缓存前缀
+     */
+    'prefix'    =>  env('DATA_PERMISSION_CACHE_PREFIX','data_permission'),
+    /**
+     * 缓存驱动
+     */
+    'driver'    =>  env('DATA_PERMISSION_CACHE_DRIVER','default'),
+];
\ No newline at end of file
diff --git a/web/src/modules/base/locales/en[English].yaml b/web/src/modules/base/locales/en[English].yaml
index 550dd048a..eb1c3a530 100644
--- a/web/src/modules/base/locales/en[English].yaml
+++ b/web/src/modules/base/locales/en[English].yaml
@@ -8,7 +8,7 @@ baseUserManage:
   userType: User type
   role: Role
   signed: Signed
-  mainTitle: User Manager
+  mainTitle: User Rule
   subTitle: Provide users with the functions of adding, editing, and deleting
   setRole: Set role
   setRoleSuccess: The role was set successfully
@@ -16,7 +16,7 @@ baseUserManage:
   setPassword: Whether to reset the password to 123456?
   setPasswordSuccess: The password was reset successfully
 baseRoleManage:
-  mainTitle: Role Manager
+  mainTitle: Role Rule
   subTitle: Provide user roles and permission settings
   name: Role name
   code: Role code

From c603c5478e6f6b4cb94f1a9e29419fd51c9c89f9 Mon Sep 17 00:00:00 2001
From: "X.Mo" <root@imoi.cn>
Date: Wed, 12 Mar 2025 14:45:07 +0800
Subject: [PATCH 22/91] =?UTF-8?q?=E9=83=A8=E9=97=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Repository/Permission/DepartmentRepository.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Repository/Permission/DepartmentRepository.php b/app/Repository/Permission/DepartmentRepository.php
index 83368ce37..34c2368ef 100644
--- a/app/Repository/Permission/DepartmentRepository.php
+++ b/app/Repository/Permission/DepartmentRepository.php
@@ -51,7 +51,7 @@ public function handleSearch(Builder $query, array $params): Builder
                 $query->whereBetween('updated_at', $params['updated_at']);
             })
             ->when(isset($params['level']), static function (Builder $query) use ($params) {
-                if ($params['level'] === 1) {
+                if ((int) $params['level'] === 1) {
                     $query->where('parent_id', 0);
                     $query->with('children');
                 }

From b6e1f60512f2ea73d22cf3e95eafd5c9f8a50576 Mon Sep 17 00:00:00 2001
From: "X.Mo" <root@imoi.cn>
Date: Thu, 13 Mar 2025 16:21:11 +0800
Subject: [PATCH 23/91] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E9=80=82=E9=85=8D=E9=83=A8=E9=97=A8=E3=80=81=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=9D=83=E9=99=90=E5=8A=9F=E8=83=BD=20-=20=E6=9C=AA=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/src/components/ma-tree/index.vue          |  2 +-
 web/src/modules/base/api/department.ts        |  2 +-
 ...344\275\223\344\270\255\346\226\207].yaml" |  1 +
 .../permission/user/data/getFormItems.tsx     | 18 ++++++++-
 .../permission/user/data/getTableColumns.tsx  | 12 +++++-
 .../base/views/permission/user/form.vue       |  5 ++-
 .../base/views/permission/user/index.vue      | 38 ++++++++++++++++++-
 web/types/components.d.ts                     |  1 -
 8 files changed, 70 insertions(+), 9 deletions(-)

diff --git a/web/src/components/ma-tree/index.vue b/web/src/components/ma-tree/index.vue
index 03c25661f..1cfc78f90 100644
--- a/web/src/components/ma-tree/index.vue
+++ b/web/src/components/ma-tree/index.vue
@@ -42,7 +42,7 @@ import { useLocalTrans } from '@/hooks/useLocalTrans.ts'
 defineOptions({ name: 'MaTree' })
 
 const { treeKey = 'label' } = defineProps<{
-  treeKey: string
+  treeKey?: string
 }>()
 
 const t = useLocalTrans()
diff --git a/web/src/modules/base/api/department.ts b/web/src/modules/base/api/department.ts
index c099bc3a9..45ca17e52 100644
--- a/web/src/modules/base/api/department.ts
+++ b/web/src/modules/base/api/department.ts
@@ -19,7 +19,7 @@ export interface DepartmentSearchVo {
   [key: string]: any
 }
 
-export function page(data: DepartmentSearchVo): Promise<ResponseStruct<PageList<DepartmentVo>>> {
+export function page(data: DepartmentSearchVo | null = null): Promise<ResponseStruct<PageList<DepartmentVo>>> {
   return useHttp().get('/admin/department/list?level=1', { params: data })
 }
 
diff --git "a/web/src/modules/base/locales/zh_CN[\347\256\200\344\275\223\344\270\255\346\226\207].yaml" "b/web/src/modules/base/locales/zh_CN[\347\256\200\344\275\223\344\270\255\346\226\207].yaml"
index 0bb4e7eab..ba75a2c72 100644
--- "a/web/src/modules/base/locales/zh_CN[\347\256\200\344\275\223\344\270\255\346\226\207].yaml"
+++ "b/web/src/modules/base/locales/zh_CN[\347\256\200\344\275\223\344\270\255\346\226\207].yaml"
@@ -3,6 +3,7 @@ baseUserManage:
   username: 用户名
   nickname: 昵称
   phone: 手机
+  dept: 所属部门
   email: 邮箱
   password: 密码
   userType: 用户类型
diff --git a/web/src/modules/base/views/permission/user/data/getFormItems.tsx b/web/src/modules/base/views/permission/user/data/getFormItems.tsx
index 559ce27ed..49278d5c9 100644
--- a/web/src/modules/base/views/permission/user/data/getFormItems.tsx
+++ b/web/src/modules/base/views/permission/user/data/getFormItems.tsx
@@ -12,13 +12,15 @@ import type { UserVo } from '~/base/api/user.ts'
 import MaUploadImage from '@/components/ma-upload-image/index.vue'
 import MaDictRadio from '@/components/ma-dict-picker/ma-dict-radio.vue'
 
-export default function getFormItems(formType: 'add' | 'edit' = 'add', t: any, model: UserVo): MaFormItem[] {
+export default function getFormItems(formType: 'add' | 'edit' = 'add', t: any, model: UserVo, deptData: Ref<any[]>): MaFormItem[] {
   if (formType === 'add') {
     model.password = '123456'
     model.status = 1
     model.user_type = 100
   }
 
+  const departmentList = deptData.value.filter((_, index) => index > 0)
+
   model.backend_setting = []
 
   return [
@@ -73,6 +75,20 @@ export default function getFormItems(formType: 'add' | 'edit' = 'add', t: any, m
         placeholder: t('form.pleaseInput', { msg: t('baseUserManage.phone') }),
       },
     },
+    {
+      label: () => t('baseUserManage.dept'),
+      prop: 'department_ids',
+      render: () => <el-tree-select />,
+      renderProps: {
+        data: departmentList,
+        filterable: true,
+        clearable: true,
+        props: { label: 'name' },
+        checkStrictly: true,
+        nodeKey: 'id',
+        placeholder: t('form.pleaseInput', { msg: t('baseUserManage.dept') }),
+      },
+    },
     {
       label: () => t('baseUserManage.email'),
       prop: 'email',
diff --git a/web/src/modules/base/views/permission/user/data/getTableColumns.tsx b/web/src/modules/base/views/permission/user/data/getTableColumns.tsx
index 99f24fc63..4727db7db 100644
--- a/web/src/modules/base/views/permission/user/data/getTableColumns.tsx
+++ b/web/src/modules/base/views/permission/user/data/getTableColumns.tsx
@@ -86,7 +86,7 @@ export default function getTableColumns(dialog: UseDialogExpose, formRef: any, t
                 const response = await deleteByIds([row.id])
                 if (response.code === ResultCode.SUCCESS) {
                   msg.success(t('crud.delSuccess'))
-                  proxy.refresh()
+                  await proxy.refresh()
                 }
               })
             },
@@ -101,6 +101,16 @@ export default function getTableColumns(dialog: UseDialogExpose, formRef: any, t
               dialog.open({ formType: 'setRole', data: row })
             },
           },
+          {
+            name: 'setDataScope',
+            show: ({ row }) => showBtn(['permission:user:getRole', 'permission:user:setRole'], row),
+            icon: 'material-symbols:person-add-rounded',
+            text: () => t('baseUserManage.setRole'),
+            onClick: ({ row }) => {
+              dialog.setTitle(t('baseUserManage.setRole'))
+              dialog.open({ formType: 'setRole', data: row })
+            },
+          },
           {
             name: 'initPassword',
             show: ({ row }) => showBtn('permission:user:password', row),
diff --git a/web/src/modules/base/views/permission/user/form.vue b/web/src/modules/base/views/permission/user/form.vue
index 253b6a599..cb338930d 100644
--- a/web/src/modules/base/views/permission/user/form.vue
+++ b/web/src/modules/base/views/permission/user/form.vue
@@ -18,13 +18,14 @@ import { ResultCode } from '@/utils/ResultCode.ts'
 defineOptions({ name: 'permission:user:form' })
 
 const { formType = 'add', data = null } = defineProps<{
-  formType: 'add' | 'edit'
+  formType?: 'add' | 'edit'
   data?: UserVo | null
 }>()
 
 const t = useTrans().globalTrans
 const userForm = ref<MaFormExpose>()
 const userModel = ref<UserVo>({})
+const deptData = inject('deptData')
 
 useForm('userForm').then((form: MaFormExpose) => {
   if (formType === 'edit' && data) {
@@ -32,7 +33,7 @@ useForm('userForm').then((form: MaFormExpose) => {
       userModel.value[key] = data[key]
     })
   }
-  form.setItems(getFormItems(formType, t, userModel.value))
+  form.setItems(getFormItems(formType, t, userModel.value, deptData))
   form.setOptions({
     labelWidth: '80px',
   })
diff --git a/web/src/modules/base/views/permission/user/index.vue b/web/src/modules/base/views/permission/user/index.vue
index 65538c930..4276d884b 100644
--- a/web/src/modules/base/views/permission/user/index.vue
+++ b/web/src/modules/base/views/permission/user/index.vue
@@ -14,6 +14,7 @@ import type { TransType } from '@/hooks/auto-imports/useTrans.ts'
 import type { UseDialogExpose } from '@/hooks/useDialog.ts'
 
 import { deleteByIds, page } from '~/base/api/user'
+import { page as departmentList } from '~/base/api/department'
 import getSearchItems from './data/getSearchItems.tsx'
 import getTableColumns from './data/getTableColumns.tsx'
 import useDialog from '@/hooks/useDialog.ts'
@@ -32,6 +33,19 @@ const selections = ref<any[]>([])
 const i18n = useTrans() as TransType
 const t = i18n.globalTrans
 const msg = useMessage()
+const deptData = ref<any[]>([])
+
+provide('deptData', deptData)
+
+// 请求部门数据
+function getDepartment() {
+  departmentList().then((res) => {
+    deptData.value = res.data.list as any[]
+    deptData.value.unshift({ id: undefined, name: '所有部门' })
+  })
+}
+
+getDepartment()
 
 // 弹窗配置
 const maDialog: UseDialogExpose = useDialog({
@@ -135,12 +149,32 @@ function handleDelete() {
     }
   })
 }
+
+// 请求某部门的用户列表
+function requestUserByDept(node: any) {
+  proTableRef.value.setRequestParams({ department_id: node.id }, true)
+}
 </script>
 
 <template>
   <div class="mine-layout flex justify-between pb-0 pl-3 pt-3">
-    <div class="w-full rounded bg-[#fff] md:w-2/12">
-      asda
+    <div class="w-full rounded bg-[#fff] p-2 md:w-2/12">
+      <ma-tree
+        :data="deptData"
+        tree-key="name"
+        node-key="id"
+        :props="{ label: 'name' }"
+        :expand-on-click-node="false"
+        @node-click="requestUserByDept"
+      >
+        <template #default="{ data }">
+          <div class="mine-tree-node">
+            <div class="label">
+              {{ data.name }}
+            </div>
+          </div>
+        </template>
+      </ma-tree>
     </div>
     <div class="w-full md:w-10/12">
       <MaProTable ref="proTableRef" :options="options" :schema="schema">
diff --git a/web/types/components.d.ts b/web/types/components.d.ts
index e20d9e3f2..71745d58d 100644
--- a/web/types/components.d.ts
+++ b/web/types/components.d.ts
@@ -12,7 +12,6 @@ declare module 'vue' {
     MaAuth: typeof import('./../src/components/ma-auth/index.vue')['default']
     MaCitySelect: typeof import('./../src/components/ma-city-select/index.vue')['default']
     MaColCard: typeof import('./../src/components/ma-col-card/index.vue')['default']
-    MaColsCard: typeof import('./../src/components/ma-cols-card/index.vue')['default']
     MaDialog: typeof import('./../src/components/ma-dialog/index.vue')['default']
     MaDictCheckbox: typeof import('./../src/components/ma-dict-picker/ma-dict-checkbox.vue')['default']
     MaDictRadio: typeof import('./../src/components/ma-dict-picker/ma-dict-radio.vue')['default']

From fe8d6863490884e8af00c03e5406f8aca6494377 Mon Sep 17 00:00:00 2001
From: "X.Mo" <root@imoi.cn>
Date: Fri, 14 Mar 2025 16:50:17 +0800
Subject: [PATCH 24/91] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E9=80=82=E9=85=8D=E9=83=A8=E9=97=A8=E3=80=81=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=9D=83=E9=99=90=E5=8A=9F=E8=83=BD=20-=20=E6=9C=AA=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...344\275\223\344\270\255\346\226\207].yaml" |  2 ++
 .../permission/user/data/getFormItems.tsx     | 19 ++++++++++++++++++-
 .../permission/user/data/getTableColumns.tsx  | 10 +++++-----
 .../base/views/permission/user/form.vue       |  1 +
 4 files changed, 26 insertions(+), 6 deletions(-)

diff --git "a/web/src/modules/base/locales/zh_CN[\347\256\200\344\275\223\344\270\255\346\226\207].yaml" "b/web/src/modules/base/locales/zh_CN[\347\256\200\344\275\223\344\270\255\346\226\207].yaml"
index ba75a2c72..920994e3a 100644
--- "a/web/src/modules/base/locales/zh_CN[\347\256\200\344\275\223\344\270\255\346\226\207].yaml"
+++ "b/web/src/modules/base/locales/zh_CN[\347\256\200\344\275\223\344\270\255\346\226\207].yaml"
@@ -4,6 +4,7 @@ baseUserManage:
   nickname: 昵称
   phone: 手机
   dept: 所属部门
+  post: 部门岗位
   email: 邮箱
   password: 密码
   userType: 用户类型
@@ -12,6 +13,7 @@ baseUserManage:
   mainTitle: 用户管理
   subTitle: 提供用户添加、编辑、删除功能，超管不可修改。
   setRole: 赋予角色
+  setDataScope: 设置数据权限
   setRoleSuccess: 用户角色设置成功
   initPassword: 初始化密码
   setPassword: 是否将用户密码重置为[123456]?
diff --git a/web/src/modules/base/views/permission/user/data/getFormItems.tsx b/web/src/modules/base/views/permission/user/data/getFormItems.tsx
index 49278d5c9..31338efff 100644
--- a/web/src/modules/base/views/permission/user/data/getFormItems.tsx
+++ b/web/src/modules/base/views/permission/user/data/getFormItems.tsx
@@ -17,6 +17,7 @@ export default function getFormItems(formType: 'add' | 'edit' = 'add', t: any, m
     model.password = '123456'
     model.status = 1
     model.user_type = 100
+    model.policy = []
   }
 
   const departmentList = deptData.value.filter((_, index) => index > 0)
@@ -77,10 +78,26 @@ export default function getFormItems(formType: 'add' | 'edit' = 'add', t: any, m
     },
     {
       label: () => t('baseUserManage.dept'),
-      prop: 'department_ids',
+      prop: 'department.id',
       render: () => <el-tree-select />,
       renderProps: {
         data: departmentList,
+        multiple: true,
+        filterable: true,
+        clearable: true,
+        props: { label: 'name' },
+        checkStrictly: true,
+        nodeKey: 'id',
+        placeholder: t('form.pleaseInput', { msg: t('baseUserManage.dept') }),
+      },
+    },
+    {
+      label: () => t('baseUserManage.post'),
+      prop: 'position.id',
+      render: () => <el-tree-select />,
+      renderProps: {
+        data: departmentList,
+        multiple: true,
         filterable: true,
         clearable: true,
         props: { label: 'name' },
diff --git a/web/src/modules/base/views/permission/user/data/getTableColumns.tsx b/web/src/modules/base/views/permission/user/data/getTableColumns.tsx
index 4727db7db..202156412 100644
--- a/web/src/modules/base/views/permission/user/data/getTableColumns.tsx
+++ b/web/src/modules/base/views/permission/user/data/getTableColumns.tsx
@@ -103,12 +103,12 @@ export default function getTableColumns(dialog: UseDialogExpose, formRef: any, t
           },
           {
             name: 'setDataScope',
-            show: ({ row }) => showBtn(['permission:user:getRole', 'permission:user:setRole'], row),
-            icon: 'material-symbols:person-add-rounded',
-            text: () => t('baseUserManage.setRole'),
+            show: ({ row }) => showBtn(['permission:user:update', 'permission:user:update'], row),
+            icon: 'mingcute:telescope-2-fill',
+            text: () => t('baseUserManage.setDataScope'),
             onClick: ({ row }) => {
-              dialog.setTitle(t('baseUserManage.setRole'))
-              dialog.open({ formType: 'setRole', data: row })
+              dialog.setTitle(t('baseUserManage.setDataScope'))
+              dialog.open({ formType: 'setDataScope', data: row })
             },
           },
           {
diff --git a/web/src/modules/base/views/permission/user/form.vue b/web/src/modules/base/views/permission/user/form.vue
index cb338930d..efde815b0 100644
--- a/web/src/modules/base/views/permission/user/form.vue
+++ b/web/src/modules/base/views/permission/user/form.vue
@@ -69,6 +69,7 @@ defineExpose({
 </script>
 
 <template>
+  {{ userModel }}
   <ma-form ref="userForm" v-model="userModel" />
 </template>
 

From 1603cc56931c3302e7af98ccce5711b9eb90e331 Mon Sep 17 00:00:00 2001
From: zds <49744633+zds-s@users.noreply.github.com>
Date: Tue, 25 Mar 2025 15:42:39 +0800
Subject: [PATCH 25/91] feat: add endpoint to retrieve positions by department
 ID with permission check

---
 .../Permission/DepartmentController.php       | 21 +++++++++++++++++++
 app/Service/Permission/DepartmentService.php  |  9 ++++++++
 2 files changed, 30 insertions(+)

diff --git a/app/Http/Admin/Controller/Permission/DepartmentController.php b/app/Http/Admin/Controller/Permission/DepartmentController.php
index 47fd80ab1..ed551e672 100644
--- a/app/Http/Admin/Controller/Permission/DepartmentController.php
+++ b/app/Http/Admin/Controller/Permission/DepartmentController.php
@@ -12,12 +12,14 @@
 
 namespace App\Http\Admin\Controller\Permission;
 
+use App\Exception\BusinessException;
 use App\Http\Admin\Controller\AbstractController;
 use App\Http\Admin\Middleware\PermissionMiddleware;
 use App\Http\Admin\Request\Permission\DepartmentRequest;
 use App\Http\Common\Middleware\AccessTokenMiddleware;
 use App\Http\Common\Middleware\OperationMiddleware;
 use App\Http\Common\Result;
+use App\Http\Common\ResultCode;
 use App\Http\CurrentUser;
 use App\Schema\DepartmentSchema;
 use App\Service\Permission\DepartmentService;
@@ -114,4 +116,23 @@ public function delete(): Result
         $this->service->deleteById($this->getRequestData());
         return $this->success();
     }
+
+    #[Get(
+        path: '/admin/department/{id}/positions',
+        operationId: 'departmentPositions',
+        summary: '获取部门下的职位列表',
+    )]
+    #[Permission(code: 'permission:department:positions')]
+    #[ResultResponse(instance: new Result())]
+    public function getPositionsByDepartmentId(int $id): Result
+    {
+        if (! $this->currentUser->isSuperAdmin()) {
+            throw new BusinessException(
+                code: ResultCode::FORBIDDEN
+            );
+        }
+        return $this->success(
+            $this->service->getPositionsByDepartmentId($id)
+        );
+    }
 }
diff --git a/app/Service/Permission/DepartmentService.php b/app/Service/Permission/DepartmentService.php
index 8977d8371..b3e97f495 100644
--- a/app/Service/Permission/DepartmentService.php
+++ b/app/Service/Permission/DepartmentService.php
@@ -48,6 +48,15 @@ public function updateById(mixed $id, array $data): mixed
         });
     }
 
+    public function getPositionsByDepartmentId(int $id): array
+    {
+        $entity = $this->repository->findById($id);
+        if (empty($entity)) {
+            throw new BusinessException(ResultCode::NOT_FOUND);
+        }
+        return $entity->positions()->get(['id', 'name'])->toArray();
+    }
+
     protected function handleEntity(Department $entity, array $data): void
     {
         if (! empty($data['department_users'])) {

From ed466c9f7a0864dc7e6d4a604fe74b9709e3efbc Mon Sep 17 00:00:00 2001
From: zds <49744633+zds-s@users.noreply.github.com>
Date: Tue, 25 Mar 2025 15:43:17 +0800
Subject: [PATCH 26/91] feat: remove super admin check from
 getPositionsByDepartmentId method

---
 .../Admin/Controller/Permission/DepartmentController.php     | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/app/Http/Admin/Controller/Permission/DepartmentController.php b/app/Http/Admin/Controller/Permission/DepartmentController.php
index ed551e672..81fe0492b 100644
--- a/app/Http/Admin/Controller/Permission/DepartmentController.php
+++ b/app/Http/Admin/Controller/Permission/DepartmentController.php
@@ -126,11 +126,6 @@ public function delete(): Result
     #[ResultResponse(instance: new Result())]
     public function getPositionsByDepartmentId(int $id): Result
     {
-        if (! $this->currentUser->isSuperAdmin()) {
-            throw new BusinessException(
-                code: ResultCode::FORBIDDEN
-            );
-        }
         return $this->success(
             $this->service->getPositionsByDepartmentId($id)
         );

From 86263407969c38404d63003b455b0a0293b29985 Mon Sep 17 00:00:00 2001
From: zds <49744633+zds-s@users.noreply.github.com>
Date: Tue, 25 Mar 2025 15:51:37 +0800
Subject: [PATCH 27/91] feat: add positions relationship to department query
 and remove unused endpoint

---
 .../Controller/Permission/DepartmentController.php  | 13 -------------
 app/Repository/Permission/DepartmentRepository.php  |  3 +++
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/app/Http/Admin/Controller/Permission/DepartmentController.php b/app/Http/Admin/Controller/Permission/DepartmentController.php
index 81fe0492b..981e02723 100644
--- a/app/Http/Admin/Controller/Permission/DepartmentController.php
+++ b/app/Http/Admin/Controller/Permission/DepartmentController.php
@@ -117,17 +117,4 @@ public function delete(): Result
         return $this->success();
     }
 
-    #[Get(
-        path: '/admin/department/{id}/positions',
-        operationId: 'departmentPositions',
-        summary: '获取部门下的职位列表',
-    )]
-    #[Permission(code: 'permission:department:positions')]
-    #[ResultResponse(instance: new Result())]
-    public function getPositionsByDepartmentId(int $id): Result
-    {
-        return $this->success(
-            $this->service->getPositionsByDepartmentId($id)
-        );
-    }
 }
diff --git a/app/Repository/Permission/DepartmentRepository.php b/app/Repository/Permission/DepartmentRepository.php
index 34c2368ef..31c39289c 100644
--- a/app/Repository/Permission/DepartmentRepository.php
+++ b/app/Repository/Permission/DepartmentRepository.php
@@ -50,6 +50,9 @@ public function handleSearch(Builder $query, array $params): Builder
             ->when(isset($params['updated_at']), static function (Builder $query) use ($params) {
                 $query->whereBetween('updated_at', $params['updated_at']);
             })
+            ->when(!empty($params['append_position']), static function (Builder $query) {
+                $query->with('positions:id,name');
+            })
             ->when(isset($params['level']), static function (Builder $query) use ($params) {
                 if ((int) $params['level'] === 1) {
                     $query->where('parent_id', 0);

From 10802b802c211e121d7e67cb045e248fbdeda714 Mon Sep 17 00:00:00 2001
From: "X.Mo" <root@imoi.cn>
Date: Thu, 27 Mar 2025 17:16:46 +0800
Subject: [PATCH 28/91] =?UTF-8?q?feat:=20=E5=AE=8C=E5=96=84=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E7=AE=A1=E7=90=86=E6=A8=A1=E5=9D=97=EF=BC=8C=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=B9=B6=E4=BC=98=E5=8C=96=E9=83=A8=E9=97=A8?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/src/modules/base/api/position.ts          |  36 +++++
 web/src/modules/base/api/user.ts              |   3 +
 web/src/modules/base/locales/en[English].yaml |   2 +
 ...344\275\223\344\270\255\346\226\207].yaml" |   1 +
 ...351\253\224\344\270\255\346\226\207].yaml" |   2 +
 .../department/data/getFormItems.tsx          |   9 +-
 .../department/data/getTableColumns.tsx       |   3 +-
 .../views/permission/department/index.vue     |  31 +++-
 .../views/permission/department/position.vue  | 137 ++++++++++++++++++
 .../permission/user/data/getFormItems.tsx     |  16 ++
 10 files changed, 230 insertions(+), 10 deletions(-)
 create mode 100644 web/src/modules/base/api/position.ts
 create mode 100644 web/src/modules/base/views/permission/department/position.vue

diff --git a/web/src/modules/base/api/position.ts b/web/src/modules/base/api/position.ts
new file mode 100644
index 000000000..57fba47a1
--- /dev/null
+++ b/web/src/modules/base/api/position.ts
@@ -0,0 +1,36 @@
+/**
+ * MineAdmin is committed to providing solutions for quickly building web applications
+ * Please view the LICENSE file that was distributed with this source code,
+ * For the full copyright and license information.
+ * Thank you very much for using MineAdmin.
+ *
+ * @Author X.Mo<root@imoi.cn>
+ * @Link   https://github.com/mineadmin
+ */
+import type { PageList, ResponseStruct } from '#/global'
+
+export interface PositionVo {
+  id?: number
+  name?: string
+}
+
+export interface PositionSearchVo {
+  name?: string
+  [key: string]: any
+}
+
+export function page(data: PositionSearchVo | null = null): Promise<ResponseStruct<PageList<PositionVo>>> {
+  return useHttp().get('/admin/position/list', { params: data })
+}
+
+export function create(data: PositionVo): Promise<ResponseStruct<null>> {
+  return useHttp().post('/admin/position', data)
+}
+
+export function save(id: number, data: PositionVo): Promise<ResponseStruct<null>> {
+  return useHttp().put(`/admin/position/${id}`, data)
+}
+
+export function deleteByIds(ids: number[]): Promise<ResponseStruct<null>> {
+  return useHttp().delete('/admin/position', { data: ids })
+}
diff --git a/web/src/modules/base/api/user.ts b/web/src/modules/base/api/user.ts
index 4121a2f1f..23a602dbc 100644
--- a/web/src/modules/base/api/user.ts
+++ b/web/src/modules/base/api/user.ts
@@ -25,6 +25,9 @@ export interface UserVo {
   backend_setting?: Record<string, any>
   remark?: string
   password?: string
+  policy?: any[]
+  department?: any[]
+  position?: any[]
 }
 
 export interface UserSearchVo {
diff --git a/web/src/modules/base/locales/en[English].yaml b/web/src/modules/base/locales/en[English].yaml
index eb1c3a530..6fdcfcb98 100644
--- a/web/src/modules/base/locales/en[English].yaml
+++ b/web/src/modules/base/locales/en[English].yaml
@@ -10,7 +10,9 @@ baseUserManage:
   signed: Signed
   mainTitle: User Rule
   subTitle: Provide users with the functions of adding, editing, and deleting
+  dataScope: Data Scope
   setRole: Set role
+  setDataScope: Set data scope
   setRoleSuccess: The role was set successfully
   initPassword: Init password
   setPassword: Whether to reset the password to 123456?
diff --git "a/web/src/modules/base/locales/zh_CN[\347\256\200\344\275\223\344\270\255\346\226\207].yaml" "b/web/src/modules/base/locales/zh_CN[\347\256\200\344\275\223\344\270\255\346\226\207].yaml"
index 920994e3a..e81730fc9 100644
--- "a/web/src/modules/base/locales/zh_CN[\347\256\200\344\275\223\344\270\255\346\226\207].yaml"
+++ "b/web/src/modules/base/locales/zh_CN[\347\256\200\344\275\223\344\270\255\346\226\207].yaml"
@@ -12,6 +12,7 @@ baseUserManage:
   signed: 个人签名
   mainTitle: 用户管理
   subTitle: 提供用户添加、编辑、删除功能，超管不可修改。
+  dataScope: 数据权限
   setRole: 赋予角色
   setDataScope: 设置数据权限
   setRoleSuccess: 用户角色设置成功
diff --git "a/web/src/modules/base/locales/zh_TW[\347\271\201\351\253\224\344\270\255\346\226\207].yaml" "b/web/src/modules/base/locales/zh_TW[\347\271\201\351\253\224\344\270\255\346\226\207].yaml"
index 46b315a38..f7db1ac2e 100644
--- "a/web/src/modules/base/locales/zh_TW[\347\271\201\351\253\224\344\270\255\346\226\207].yaml"
+++ "b/web/src/modules/base/locales/zh_TW[\347\271\201\351\253\224\344\270\255\346\226\207].yaml"
@@ -10,7 +10,9 @@ baseUserManage:
   role: 角色
   mainTitle: 用戶管理
   subTitle: 提供使用者添加、編輯、刪除功能，超管不可修改。
+  dataScope: 數據權限
   setRole: 賦予角色
+  setDataScope: 設置數據權限
   setRoleSuccess: 用戶角色設置成功
   initPassword: 重設密碼
   setPassword: 是否將密碼重設為[123456]?
diff --git a/web/src/modules/base/views/permission/department/data/getFormItems.tsx b/web/src/modules/base/views/permission/department/data/getFormItems.tsx
index e49b4e83b..336ff6c07 100644
--- a/web/src/modules/base/views/permission/department/data/getFormItems.tsx
+++ b/web/src/modules/base/views/permission/department/data/getFormItems.tsx
@@ -9,12 +9,17 @@
  */
 import type { MaFormItem } from '@mineadmin/form'
 
-export default function getFormItems(formType: 'add' | 'edit' = 'add', t: any): MaFormItem[] {
+export default function getFormItems(formType: 'add' | 'edit' = 'add', t: any, model: any): MaFormItem[] {
   const treeSelectRef = ref()
-  const deptList = ref([])
+  const deptList = ref<any[]>([])
+
+  if (formType === 'add') {
+    model.parent_id = 0
+  }
 
   useHttp().get('/admin/department/list?level=1').then((res: any) => {
     deptList.value = res.data.list
+    deptList.value.unshift({ id: 0, name: '顶级部门', value: 0 } as any)
   })
 
   return [
diff --git a/web/src/modules/base/views/permission/department/data/getTableColumns.tsx b/web/src/modules/base/views/permission/department/data/getTableColumns.tsx
index 39e6e1847..0218a9c83 100644
--- a/web/src/modules/base/views/permission/department/data/getTableColumns.tsx
+++ b/web/src/modules/base/views/permission/department/data/getTableColumns.tsx
@@ -63,8 +63,9 @@ export default function getTableColumns(dialog: UseDialogExpose, formRef: any, t
             show: () => showBtn('permission:department:update'),
             text: () => t('baseDepartment.page.managePost'),
             onClick: ({ row }) => {
+              dialog.setAttr({ width: '55%' })
               dialog.setTitle(t('baseDepartment.page.managePost'))
-              dialog.open({ formType: 'managePost', data: row })
+              dialog.open({ formType: 'position', data: row })
             },
           },
           {
diff --git a/web/src/modules/base/views/permission/department/index.vue b/web/src/modules/base/views/permission/department/index.vue
index e882fca19..d2edcc8c7 100644
--- a/web/src/modules/base/views/permission/department/index.vue
+++ b/web/src/modules/base/views/permission/department/index.vue
@@ -21,17 +21,21 @@ import { useMessage } from '@/hooks/useMessage.ts'
 import { ResultCode } from '@/utils/ResultCode.ts'
 
 import DepartmentForm from './form.vue'
-// import SetLeader from './setLeader.vue'
+import Position from './position.vue'
 
 defineOptions({ name: 'permission:department' })
 
 const proTableRef = ref<MaProTableExpose>() as Ref<MaProTableExpose>
 const formRef = ref()
-const setFormRef = ref()
+const setLeaderRef = ref()
+const positionRef = ref()
 const selections = ref<any[]>([])
 const i18n = useTrans() as TransType
 const t = i18n.globalTrans
 const msg = useMessage()
+const states = ref<Record<string, boolean>>({
+  isExpand: false,
+})
 
 // 弹窗配置
 const maDialog: UseDialogExpose = useDialog({
@@ -67,6 +71,9 @@ const maDialog: UseDialogExpose = useDialog({
         }
       }).catch()
     }
+    else if (formType === 'position') {
+      maDialog.close()
+    }
     else {
       const elForm = setFormRef.value.maForm.getElFormRef()
       // 验证通过后
@@ -136,6 +143,14 @@ function handleDelete() {
     }
   })
 }
+
+function expandToggle() {
+  states.value.isExpand = !states.value.isExpand
+  const tableStates = proTableRef.value?.getElTableStates?.()
+  Object.keys(tableStates.treeData.value).map((key: string) => {
+    tableStates.treeData.value[key]!.expanded = states.value.isExpand
+  })
+}
 </script>
 
 <template>
@@ -165,8 +180,8 @@ function handleDelete() {
           {{ t('crud.delete') }}
         </el-button>
         <div>
-          <el-button>
-            展开
+          <el-button @click="expandToggle">
+            {{ t('crud.searchUnFold') }}
           </el-button>
         </div>
       </template>
@@ -190,9 +205,11 @@ function handleDelete() {
     <component :is="maDialog.Dialog">
       <template #default="{ formType, data }">
         <!-- 新增、编辑表单 -->
-        <DepartmentForm v-if="formType !== 'setLeader'" ref="formRef" :form-type="formType" :data="data" />
-        <!-- 赋予菜单表单 -->
-        <!--        <SetLeader v-else ref="setFormRef" :data="data" /> -->
+        <DepartmentForm v-if="formType.includes('add', 'edit')" ref="formRef" :form-type="formType" :data="data" />
+        <!-- 设置部门领导 -->
+        <!--        <SetLeader v-if="formType === 'setLeader'" ref="setLeaderRef" :data="data" /> -->
+        <!-- 管理部门岗位 -->
+        <Position v-if="formType === 'position'" ref="positionRef" :data="data" />
       </template>
     </component>
   </div>
diff --git a/web/src/modules/base/views/permission/department/position.vue b/web/src/modules/base/views/permission/department/position.vue
new file mode 100644
index 000000000..1d99c79e6
--- /dev/null
+++ b/web/src/modules/base/views/permission/department/position.vue
@@ -0,0 +1,137 @@
+<!--
+ - MineAdmin is committed to providing solutions for quickly building web applications
+ - Please view the LICENSE file that was distributed with this source code,
+ - For the full copyright and license information.
+ - Thank you very much for using MineAdmin.
+ -
+ - @Author X.Mo<root@imoi.cn>
+ - @Link https://github.com/mineadmin
+-->
+
+<script setup lang="tsx">
+import type { DepartmentVo } from '~/base/api/department.ts'
+import { deleteByIds, page } from '~/base/api/position.ts'
+import type { MaProTableExpose, MaProTableOptions, MaProTableSchema } from '@mineadmin/pro-table'
+import type { TransType } from '@/hooks/auto-imports/useTrans.ts'
+import { useMessage } from '@/hooks/useMessage.ts'
+import hasAuth from '@/utils/permission/hasAuth.ts'
+
+const { data = null } = defineProps<{
+  data?: DepartmentVo | null
+}>()
+
+const i18n = useTrans() as TransType
+const t = i18n.globalTrans
+const proTableRef = ref<MaProTableExpose>()
+
+const msg = useMessage()
+
+function showBtn(auth: string | string[]) {
+  return hasAuth(auth)
+}
+
+// 参数配置
+const options = ref<MaProTableOptions>({
+  header: { show: false },
+  // 表格参数
+  tableOptions: {
+    adaption: false,
+    height: 400,
+    rowKey: 'id',
+  },
+  // 搜索参数
+  searchOptions: {
+    fold: true,
+    text: {
+      searchBtn: () => t('crud.search'),
+      resetBtn: () => t('crud.reset'),
+    },
+  },
+  // 搜索表单参数
+  searchFormOptions: { labelWidth: '90px' },
+  // 请求配置
+  requestOptions: {
+    api: page,
+  },
+})
+// 架构配置
+const schema = ref<MaProTableSchema>({
+  // 搜索项
+  searchItems: [{ label: '岗位名称', prop: 'name', render: 'input' }],
+  // 表格列
+  tableColumns: [
+    // 多选列
+    { type: 'selection', showOverflowTooltip: false, label: () => t('crud.selection') },
+    {
+      label: '岗位名称',
+      prop: 'name',
+      align: 'left',
+    }, {
+      label: '创建时间',
+      prop: 'created_at',
+      width: 180,
+    },
+    // 操作列
+    {
+      type: 'operation',
+      align: 'right',
+      label: () => t('crud.operation'),
+      width: '180px',
+      operationConfigure: {
+        actions: [
+          {
+            name: 'edit',
+            icon: 'material-symbols:person-edit',
+            show: () => showBtn('permission:position:update'),
+            text: () => t('crud.edit'),
+            onClick: ({ row }) => {
+            },
+          },
+          {
+            name: 'del',
+            show: () => showBtn('permission:position:delete'),
+            icon: 'mdi:delete',
+            text: () => t('crud.delete'),
+            onClick: ({ row }, proxy: MaProTableExpose) => {
+              msg.delConfirm(t('crud.delDataMessage')).then(async () => {
+                const response = await deleteByIds([row.id])
+                if (response.code === ResultCode.SUCCESS) {
+                  msg.success(t('crud.delSuccess'))
+                  await proxy.refresh()
+                }
+              })
+            },
+          },
+        ],
+      },
+    },
+  ],
+})
+</script>
+
+<template>
+  <ma-pro-table ref="proTableRef" :options="options" :schema="schema">
+    <template #actions>
+      <el-button
+        v-auth="['permission:position:save']"
+        type="primary"
+        @click="() => {
+          // maDialog.setTitle(t('crud.add'))
+          // maDialog.open({ formType: 'add' })
+        }"
+      >
+        {{ t('crud.add') }}
+      </el-button>
+    </template>
+  </ma-pro-table>
+</template>
+
+<style scoped lang="scss">
+:deep(.mineadmin-pro-table-search) {
+  margin: 0; padding: 0;
+  @apply pt-3;
+}
+:deep(.mine-card) {
+  margin: 0;
+}
+</style>
diff --git a/web/src/modules/base/views/permission/user/data/getFormItems.tsx b/web/src/modules/base/views/permission/user/data/getFormItems.tsx
index 31338efff..c85a3cdd0 100644
--- a/web/src/modules/base/views/permission/user/data/getFormItems.tsx
+++ b/web/src/modules/base/views/permission/user/data/getFormItems.tsx
@@ -89,12 +89,16 @@ export default function getFormItems(formType: 'add' | 'edit' = 'add', t: any, m
         checkStrictly: true,
         nodeKey: 'id',
         placeholder: t('form.pleaseInput', { msg: t('baseUserManage.dept') }),
+        onChange: (value: any) => {
+          console.log(value)
+        },
       },
     },
     {
       label: () => t('baseUserManage.post'),
       prop: 'position.id',
       render: () => <el-tree-select />,
+      cols: { md: 12, xs: 24 },
       renderProps: {
         data: departmentList,
         multiple: true,
@@ -106,6 +110,18 @@ export default function getFormItems(formType: 'add' | 'edit' = 'add', t: any, m
         placeholder: t('form.pleaseInput', { msg: t('baseUserManage.dept') }),
       },
     },
+    {
+      label: () => t('baseUserManage.dataScope'),
+      render: () => <el-button />,
+      cols: { md: 12, xs: 24 },
+      renderProps: {
+        type: 'primary',
+        plain: true,
+      },
+      renderSlots: {
+        default: () => t('baseUserManage.setDataScope'),
+      },
+    },
     {
       label: () => t('baseUserManage.email'),
       prop: 'email',

From 6baf2023c5d292131438b4f6d2c5a070471b14f6 Mon Sep 17 00:00:00 2001
From: "X.Mo" <root@imoi.cn>
Date: Fri, 28 Mar 2025 11:38:14 +0800
Subject: [PATCH 29/91] =?UTF-8?q?feat:=20=E9=83=A8=E9=97=A8=E4=B8=8B?=
 =?UTF-8?q?=E7=9A=84=E5=B2=97=E4=BD=8D=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/src/modules/base/api/position.ts          |   2 +
 .../views/permission/component/dataScope.vue  |  42 +++++++
 .../views/permission/department/position.vue  | 108 +++++++++++++++++-
 3 files changed, 147 insertions(+), 5 deletions(-)
 create mode 100644 web/src/modules/base/views/permission/component/dataScope.vue

diff --git a/web/src/modules/base/api/position.ts b/web/src/modules/base/api/position.ts
index 57fba47a1..467031454 100644
--- a/web/src/modules/base/api/position.ts
+++ b/web/src/modules/base/api/position.ts
@@ -11,6 +11,8 @@ import type { PageList, ResponseStruct } from '#/global'
 
 export interface PositionVo {
   id?: number
+  dept_id?: number
+  dept_name?: string
   name?: string
 }
 
diff --git a/web/src/modules/base/views/permission/component/dataScope.vue b/web/src/modules/base/views/permission/component/dataScope.vue
new file mode 100644
index 000000000..a6d0440c5
--- /dev/null
+++ b/web/src/modules/base/views/permission/component/dataScope.vue
@@ -0,0 +1,42 @@
+<script setup lang="ts">
+import type { MaFormItem } from '@mineadmin/form'
+import MaDictSelect from '@/components/ma-dict-picker/ma-dict-select.vue'
+
+defineOptions({ name: 'DataScope' })
+
+interface DataScopeVo {
+  dataScope: string
+  deptIds: number[]
+}
+
+const model = ref<DataScopeVo>({
+  dataScope: '1',
+  deptIds: [],
+})
+
+const items = ref<MaFormItem[]>([
+  {
+    label: '数据权限',
+    prop: 'policy_type',
+    render: () => MaDictSelect,
+    renderProps: {
+      data: [
+        { label: '全部数据权限', value: 'ALL' },
+        { label: '本部门数据权限', value: 'DEPT_SELF' },
+        { label: '本部门及所有子部门数据权限', value: 'DEPT_TREE' },
+        { label: '本人数据权限', value: 'SELF' },
+        { label: '自选部门数据权限', value: 'CUSTOM_DEPT' },
+        { label: '自定义数据权限', value: 'CUSTOM_FUNC' },
+      ],
+    },
+  },
+])
+</script>
+
+<template>
+  <ma-form v-model="model" :items="items" />
+</template>
+
+<style scoped lang="scss">
+
+</style>
diff --git a/web/src/modules/base/views/permission/department/position.vue b/web/src/modules/base/views/permission/department/position.vue
index 1d99c79e6..c3df4756a 100644
--- a/web/src/modules/base/views/permission/department/position.vue
+++ b/web/src/modules/base/views/permission/department/position.vue
@@ -10,11 +10,18 @@
 
 <script setup lang="tsx">
 import type { DepartmentVo } from '~/base/api/department.ts'
-import { deleteByIds, page } from '~/base/api/position.ts'
+import type { PositionVo } from '~/base/api/position.ts'
+import { create, deleteByIds, page, save } from '~/base/api/position.ts'
 import type { MaProTableExpose, MaProTableOptions, MaProTableSchema } from '@mineadmin/pro-table'
+import type { MaFormExpose } from '@mineadmin/form'
 import type { TransType } from '@/hooks/auto-imports/useTrans.ts'
+import type { UseDialogExpose } from '@/hooks/useDialog.ts'
+import useDialog from '@/hooks/useDialog.ts'
 import { useMessage } from '@/hooks/useMessage.ts'
 import hasAuth from '@/utils/permission/hasAuth.ts'
+import { ResultCode } from '@/utils/ResultCode.ts'
+
+import DataScope from '~/base/views/permission/component/dataScope.vue'
 
 const { data = null } = defineProps<{
   data?: DepartmentVo | null
@@ -23,6 +30,11 @@ const { data = null } = defineProps<{
 const i18n = useTrans() as TransType
 const t = i18n.globalTrans
 const proTableRef = ref<MaProTableExpose>()
+const positionForm = ref<MaFormExpose>()
+const postModel = ref<PositionVo>({
+  dept_id: data?.id,
+  dept_name: data?.name,
+})
 
 const msg = useMessage()
 
@@ -30,6 +42,43 @@ function showBtn(auth: string | string[]) {
   return hasAuth(auth)
 }
 
+// 弹窗配置
+const maDialog: UseDialogExpose = useDialog({
+  lgWidth: '550px',
+  ok: ({ formType }, okLoadingState: (state: boolean) => void) => {
+    okLoadingState(true)
+    if (['add', 'edit'].includes(formType)) {
+      const elForm = positionForm.value?.getElFormRef()
+      // 验证通过后
+      elForm?.validate?.().then(() => {
+        switch (formType) {
+          // 新增
+          case 'add':
+            create(postModel.value).then((res: any) => {
+              res.code === ResultCode.SUCCESS ? msg.success(t('crud.createSuccess')) : msg.error(res.message)
+              maDialog.close()
+              proTableRef.value?.refresh()
+            }).catch((err: any) => {
+              msg.alertError(err)
+            })
+            break
+          // 修改
+          case 'edit':
+            save(postModel.value?.id as number, postModel.value).then((res: any) => {
+              res.code === 200 ? msg.success(t('crud.updateSuccess')) : msg.error(res.message)
+              maDialog.close()
+              proTableRef.value?.refresh()
+            }).catch((err: any) => {
+              msg.alertError(err)
+            })
+            break
+        }
+      }).catch()
+    }
+    okLoadingState(false)
+  },
+})
+
 // 参数配置
 const options = ref<MaProTableOptions>({
   header: { show: false },
@@ -51,9 +100,14 @@ const options = ref<MaProTableOptions>({
   searchFormOptions: { labelWidth: '90px' },
   // 请求配置
   requestOptions: {
+    // autoRequest: false,
+    requestParams: {
+      dept_id: data?.id,
+    },
     api: page,
   },
 })
+
 // 架构配置
 const schema = ref<MaProTableSchema>({
   // 搜索项
@@ -74,17 +128,31 @@ const schema = ref<MaProTableSchema>({
     // 操作列
     {
       type: 'operation',
-      align: 'right',
       label: () => t('crud.operation'),
-      width: '180px',
+      width: '280px',
       operationConfigure: {
+        type: 'tile',
         actions: [
+          {
+            name: 'dataScope',
+            icon: 'mdi:sort-variant-lock-open',
+            show: () => showBtn('permission:position:update'),
+            text: () => t('baseUserManage.setDataScope'),
+            onClick: ({ row }) => {
+              Object.keys(row).map((key: string) => postModel.value[key] = row[key])
+              maDialog.setTitle(t('baseUserManage.setDataScope'))
+              maDialog.open({ formType: 'setDataScope' })
+            },
+          },
           {
             name: 'edit',
             icon: 'material-symbols:person-edit',
             show: () => showBtn('permission:position:update'),
             text: () => t('crud.edit'),
             onClick: ({ row }) => {
+              Object.keys(row).map((key: string) => postModel.value[key] = row[key])
+              maDialog.setTitle(t('crud.edit'))
+              maDialog.open({ formType: 'edit' })
             },
           },
           {
@@ -107,6 +175,9 @@ const schema = ref<MaProTableSchema>({
     },
   ],
 })
+
+onMounted(() => {
+})
 </script>
 
 <template>
@@ -116,14 +187,41 @@ const schema = ref<MaProTableSchema>({
         v-auth="['permission:position:save']"
         type="primary"
         @click="() => {
-          // maDialog.setTitle(t('crud.add'))
-          // maDialog.open({ formType: 'add' })
+          maDialog.setTitle(t('crud.add'))
+          maDialog.open({ formType: 'add' })
         }"
       >
         {{ t('crud.add') }}
       </el-button>
     </template>
   </ma-pro-table>
+
+  <component :is="maDialog.Dialog">
+    <template #default="{ formType }">
+      <ma-form
+        v-if="['add', 'edit'].includes(formType)"
+        ref="positionForm"
+        v-model="postModel"
+        :options="{ labelWidth: 90 }"
+        :items="[
+          {
+            label: '所属部门',
+            prop: 'dept_name',
+            render: 'input',
+            renderProps: { disabled: true },
+          },
+          {
+            label: '岗位名称',
+            prop: 'name',
+            render: 'input',
+            renderProps: { placeholder: '请输入岗位名称' },
+            itemProps: { rules: [{ required: true, message: '岗位名称必填' }] },
+          },
+        ]"
+      />
+      <DataScope />
+    </template>
+  </component>
 </template>
 
 <style scoped lang="scss">

From d23bd7bccda0636fac90ce7595245e3b4eef7e31 Mon Sep 17 00:00:00 2001
From: zds <49744633+zds-s@users.noreply.github.com>
Date: Fri, 28 Mar 2025 11:49:51 +0800
Subject: [PATCH 30/91] feat: update role to position relationship and add
 batch data permission request

---
 .../Permission/PositionController.php         | 16 +++++++
 ...hGrantDataPermissionForPositionRequest.php | 44 +++++++++++++++++++
 .../Admin/Request/Permission/RoleRequest.php  | 19 +-------
 app/Model/DataPermission/Policy.php           |  6 +--
 app/Model/Permission/Position.php             |  7 +++
 app/Model/Permission/Role.php                 |  8 ----
 .../Permission/PositionRepository.php         |  2 +-
 app/Service/Permission/PositionService.php    | 11 +++++
 app/Service/Permission/RoleService.php        | 30 -------------
 ..._02_24_195620_create_department_tables.php |  2 +-
 10 files changed, 84 insertions(+), 61 deletions(-)
 create mode 100644 app/Http/Admin/Request/Permission/BatchGrantDataPermissionForPositionRequest.php

diff --git a/app/Http/Admin/Controller/Permission/PositionController.php b/app/Http/Admin/Controller/Permission/PositionController.php
index 613d56763..15be0d80d 100644
--- a/app/Http/Admin/Controller/Permission/PositionController.php
+++ b/app/Http/Admin/Controller/Permission/PositionController.php
@@ -14,6 +14,7 @@
 
 use App\Http\Admin\Controller\AbstractController;
 use App\Http\Admin\Middleware\PermissionMiddleware;
+use App\Http\Admin\Request\Permission\BatchGrantDataPermissionForPositionRequest;
 use App\Http\Admin\Request\Permission\PositionRequest;
 use App\Http\Common\Middleware\AccessTokenMiddleware;
 use App\Http\Common\Middleware\OperationMiddleware;
@@ -64,6 +65,21 @@ public function pageList(): Result
         );
     }
 
+    #[Put(
+        path: '/admin/position/{id}/data_permission',
+        operationId: 'positionDataPermission',
+        summary: '设置岗位数据权限',
+        security: [['Bearer' => [], 'ApiKey' => []]],
+        tags: ['岗位管理'],
+    )]
+    #[Permission(code: 'permission:position:data_permission')]
+    #[ResultResponse(instance: new Result())]
+    public function batchDataPermission(int $id,BatchGrantDataPermissionForPositionRequest $request): Result
+    {
+        $this->service->batchDataPermission($id, $request->validated());
+        return $this->success();
+    }
+
     #[Post(
         path: '/admin/position',
         operationId: 'positionCreate',
diff --git a/app/Http/Admin/Request/Permission/BatchGrantDataPermissionForPositionRequest.php b/app/Http/Admin/Request/Permission/BatchGrantDataPermissionForPositionRequest.php
new file mode 100644
index 000000000..d7f70ae24
--- /dev/null
+++ b/app/Http/Admin/Request/Permission/BatchGrantDataPermissionForPositionRequest.php
@@ -0,0 +1,44 @@
+<?php
+
+namespace App\Http\Admin\Request\Permission;
+
+use App\Http\Common\Request\Traits\NoAuthorizeTrait;
+use App\Model\Enums\DataPermission\PolicyType;
+use Hyperf\Validation\Request\FormRequest;
+use Hyperf\Validation\Rule;
+
+class BatchGrantDataPermissionForPositionRequest extends FormRequest
+{
+    use NoAuthorizeTrait;
+
+    public function rules(): array
+    {
+        return [
+            'policy_type' => [
+                'required',
+                'string',
+                'max:10',
+                Rule::enum(PolicyType::class),
+            ],
+            'value' => [
+                'sometimes',
+                'array',
+                'min:1',
+            ],
+            'is_default' => [
+                'sometimes',
+                'integer',
+                'in:0,1',
+            ],
+        ];
+    }
+
+    public function attributes(): array
+    {
+        return [
+            'policy_type' => '策略类型',
+            'value' => '策略值',
+            'is_default' => '是否默认策略',
+        ];
+    }
+}
\ No newline at end of file
diff --git a/app/Http/Admin/Request/Permission/RoleRequest.php b/app/Http/Admin/Request/Permission/RoleRequest.php
index 3e8ae9e7f..1879f3534 100644
--- a/app/Http/Admin/Request/Permission/RoleRequest.php
+++ b/app/Http/Admin/Request/Permission/RoleRequest.php
@@ -42,24 +42,7 @@ public function rules(): array
             ],
             'status' => 'sometimes|integer|in:1,2',
             'sort' => 'required|integer',
-            'remark' => 'nullable|string|max:255',
-            'policy' => 'nullable|array',
-            'policy.*.policy_type' => [
-                'required_with:policy',
-                'string',
-                'max:10',
-                Rule::enum(PolicyType::class),
-            ],
-            'policy.*.value' => [
-                'sometimes',
-                'array',
-                'min:1',
-            ],
-            'policy.*.is_default' => [
-                'sometimes',
-                'integer',
-                'in:0,1',
-            ],
+            'remark' => 'nullable|string|max:255'
         ];
         if ($this->isCreate()) {
             $rules['code'][] = 'unique:role,code';
diff --git a/app/Model/DataPermission/Policy.php b/app/Model/DataPermission/Policy.php
index 48e62a4cd..f64c34df3 100644
--- a/app/Model/DataPermission/Policy.php
+++ b/app/Model/DataPermission/Policy.php
@@ -20,7 +20,7 @@
 /**
  * @property int $id
  * @property int $user_id 用户ID（与角色二选一）
- * @property int $role_id 角色ID（与用户二选一）
+ * @property int $position_id 角色ID（与用户二选一）
  * @property PolicyType $policy_type 策略类型（DEPT_SELF, DEPT_TREE, ALL, SELF, CUSTOM_DEPT, CUSTOM_FUNC）
  * @property bool $is_default 是否默认策略（默认值：true）
  * @property array $value 策略值
@@ -40,13 +40,13 @@ class Policy extends Model
     /**
      * The attributes that are mass assignable.
      */
-    protected array $fillable = ['id', 'user_id', 'role_id', 'policy_type', 'is_default', 'created_at', 'updated_at', 'deleted_at', 'value'];
+    protected array $fillable = ['id', 'user_id', 'position_id', 'policy_type', 'is_default', 'created_at', 'updated_at', 'deleted_at', 'value'];
 
     /**
      * The attributes that should be cast to native types.
      */
     protected array $casts = [
-        'id' => 'integer', 'user_id' => 'integer', 'role_id' => 'integer',
+        'id' => 'integer', 'user_id' => 'integer', 'position_id' => 'integer',
         'is_default' => 'bool', 'created_at' => 'datetime',
         'updated_at' => 'datetime', 'deleted_at' => 'datetime',
         'policy_type' => PolicyType::class, 'value' => 'array',
diff --git a/app/Model/Permission/Position.php b/app/Model/Permission/Position.php
index 1f7d4e12a..76db16c73 100644
--- a/app/Model/Permission/Position.php
+++ b/app/Model/Permission/Position.php
@@ -12,6 +12,7 @@
 
 namespace App\Model\Permission;
 
+use App\Model\DataPermission\Policy;
 use Carbon\Carbon;
 use Hyperf\Database\Model\Collection;
 use Hyperf\Database\Model\Relations\BelongsTo;
@@ -28,6 +29,7 @@
  * @property Carbon $deleted_at
  * @property null|Department $department
  * @property Collection<int,User>|User[] $users
+ * @property Policy $policy
  */
 class Position extends Model
 {
@@ -57,4 +59,9 @@ public function users(): BelongsToMany
     {
         return $this->belongsToMany(User::class, 'user_position', 'position_id', 'user_id');
     }
+
+    public function policy(): BelongsTo
+    {
+        return $this->belongsTo(Policy::class, 'id', 'id');
+    }
 }
diff --git a/app/Model/Permission/Role.php b/app/Model/Permission/Role.php
index ed2d207dc..40fb10f4f 100644
--- a/app/Model/Permission/Role.php
+++ b/app/Model/Permission/Role.php
@@ -12,12 +12,10 @@
 
 namespace App\Model\Permission;
 
-use App\Model\DataPermission\Policy;
 use App\Model\Enums\User\Status;
 use Carbon\Carbon;
 use Hyperf\Database\Model\Collection;
 use Hyperf\Database\Model\Events\Deleting;
-use Hyperf\Database\Model\Relations\BelongsTo;
 use Hyperf\Database\Model\Relations\BelongsToMany;
 use Hyperf\DbConnection\Model\Model as MineModel;
 
@@ -35,7 +33,6 @@
  * @property string $remark 备注
  * @property Collection|Menu[] $menus
  * @property Collection|User[] $users
- * @property null|Policy $policy 数据权限策略
  */
 final class Role extends MineModel
 {
@@ -92,11 +89,6 @@ public function deleting(Deleting $event)
     {
         $this->users()->detach();
         $this->menus()->detach();
-        $this->policy()->delete();
     }
 
-    public function policy(): BelongsTo
-    {
-        return $this->belongsTo(Policy::class, 'policy_id', 'id');
-    }
 }
diff --git a/app/Repository/Permission/PositionRepository.php b/app/Repository/Permission/PositionRepository.php
index 71a6b87d5..b8c5d216a 100644
--- a/app/Repository/Permission/PositionRepository.php
+++ b/app/Repository/Permission/PositionRepository.php
@@ -40,6 +40,6 @@ public function handleSearch(Builder $query, array $params): Builder
             ->when(isset($params['updated_at']), static function (Builder $query) use ($params) {
                 $query->whereBetween('updated_at', $params['updated_at']);
             })
-            ->with(['department']);
+            ->with(['department','policy']);
     }
 }
diff --git a/app/Service/Permission/PositionService.php b/app/Service/Permission/PositionService.php
index 1f6d46b9f..5fb50168d 100644
--- a/app/Service/Permission/PositionService.php
+++ b/app/Service/Permission/PositionService.php
@@ -12,6 +12,8 @@
 
 namespace App\Service\Permission;
 
+use App\Exception\BusinessException;
+use App\Http\Common\ResultCode;
 use App\Model\Permission\Position;
 use App\Repository\Permission\PositionRepository;
 use App\Service\IService;
@@ -24,4 +26,13 @@ class PositionService extends IService
     public function __construct(
         protected readonly PositionRepository $repository
     ) {}
+
+    public function batchDataPermission(int $id, array $policy): void
+    {
+        $entity = $this->repository->findById($id);
+        if ($entity === null) {
+            throw new BusinessException(ResultCode::NOT_FOUND);
+        }
+        $entity->policy()->updateOrCreate([], $policy);
+    }
 }
diff --git a/app/Service/Permission/RoleService.php b/app/Service/Permission/RoleService.php
index 092693a29..30cfb5c4c 100644
--- a/app/Service/Permission/RoleService.php
+++ b/app/Service/Permission/RoleService.php
@@ -56,34 +56,4 @@ public function batchGrantPermissionsForRole(int $id, array $permissionsCode): v
                     ->toArray()
             );
     }
-
-    public function create(array $data): mixed
-    {
-        return Db::transaction(function () use ($data) {
-            /**
-             * @var Role $entity
-             */
-            $entity = parent::create($data);
-            if (isset($data['policy'])) {
-                $entity->policy()->create($data['policy']);
-            }
-        });
-    }
-
-    public function updateById(mixed $id, array $data): mixed
-    {
-        return Db::transaction(function () use ($id, $data) {
-            /**
-             * @var Role $entity
-             */
-            $entity = $this->repository->findById($id);
-            if (empty($entity)) {
-                throw new BusinessException(code: ResultCode::NOT_FOUND);
-            }
-            $entity->update($data);
-            if (isset($data['policy'])) {
-                $entity->policy()->update($data['policy']);
-            }
-        });
-    }
 }
diff --git a/databases/migrations/2025_02_24_195620_create_department_tables.php b/databases/migrations/2025_02_24_195620_create_department_tables.php
index 2f9477ddb..b40bc1715 100644
--- a/databases/migrations/2025_02_24_195620_create_department_tables.php
+++ b/databases/migrations/2025_02_24_195620_create_department_tables.php
@@ -58,7 +58,7 @@ public function up(): void
             $table->comment('数据权限策略');
             $table->bigIncrements('id');
             $table->bigInteger('user_id')->default(0)->comment('用户ID（与角色二选一）');
-            $table->bigInteger('role_id')->default(0)->comment('角色ID（与用户二选一）');
+            $table->bigInteger('position_id')->default(0)->comment('岗位ID（与用户二选一）');
             $table->string('policy_type', 20)->comment('策略类型（DEPT_SELF, DEPT_TREE, ALL, SELF, CUSTOM_DEPT, CUSTOM_FUNC）');
             $table->boolean('is_default')->default(true)->comment('是否默认策略（默认值：true）');
             $table->json('value')->nullable()->comment('策略值');

From 26060692d17960db95a5f347ef87368222c19ec2 Mon Sep 17 00:00:00 2001
From: zds <49744633+zds-s@users.noreply.github.com>
Date: Fri, 28 Mar 2025 11:56:38 +0800
Subject: [PATCH 31/91] feat: add positions and users relationships to Policy
 model

---
 app/Model/DataPermission/Policy.php | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/app/Model/DataPermission/Policy.php b/app/Model/DataPermission/Policy.php
index f64c34df3..c4ad45d40 100644
--- a/app/Model/DataPermission/Policy.php
+++ b/app/Model/DataPermission/Policy.php
@@ -13,7 +13,11 @@
 namespace App\Model\DataPermission;
 
 use App\Model\Enums\DataPermission\PolicyType;
+use App\Model\Permission\Position;
+use App\Model\Permission\User;
 use Carbon\Carbon;
+use Hyperf\Database\Model\Collection;
+use Hyperf\Database\Model\Relations\BelongsToMany;
 use Hyperf\Database\Model\SoftDeletes;
 use Hyperf\DbConnection\Model\Model;
 
@@ -27,6 +31,8 @@
  * @property Carbon $created_at
  * @property Carbon $updated_at
  * @property Carbon $deleted_at
+ * @property Position[]|Collection<int,Position> $positions
+ * @property User[]|Collection<int,User> $users
  */
 class Policy extends Model
 {
@@ -51,4 +57,15 @@ class Policy extends Model
         'updated_at' => 'datetime', 'deleted_at' => 'datetime',
         'policy_type' => PolicyType::class, 'value' => 'array',
     ];
+
+    public function positions(): BelongsToMany
+    {
+        return $this->belongsToMany(Position::class, 'data_permission_policy_position', 'policy_id', 'position_id');
+    }
+
+    public function users(): BelongsToMany
+    {
+        return $this->belongsToMany(User::class, 'data_permission_policy_user', 'policy_id', 'user_id');
+    }
+
 }

From fad0faf3dc9b3680c7730333045696287b2879a0 Mon Sep 17 00:00:00 2001
From: "X.Mo" <root@imoi.cn>
Date: Tue, 8 Apr 2025 17:34:26 +0800
Subject: [PATCH 32/91] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/src/modules/base/api/position.ts          |  1 +
 .../views/permission/component/dataScope.vue  | 44 ++++++++++++++++---
 .../views/permission/department/position.vue  |  3 +-
 3 files changed, 41 insertions(+), 7 deletions(-)

diff --git a/web/src/modules/base/api/position.ts b/web/src/modules/base/api/position.ts
index 467031454..893df8662 100644
--- a/web/src/modules/base/api/position.ts
+++ b/web/src/modules/base/api/position.ts
@@ -14,6 +14,7 @@ export interface PositionVo {
   dept_id?: number
   dept_name?: string
   name?: string
+  policy?: string
 }
 
 export interface PositionSearchVo {
diff --git a/web/src/modules/base/views/permission/component/dataScope.vue b/web/src/modules/base/views/permission/component/dataScope.vue
index a6d0440c5..9b684d30d 100644
--- a/web/src/modules/base/views/permission/component/dataScope.vue
+++ b/web/src/modules/base/views/permission/component/dataScope.vue
@@ -1,17 +1,24 @@
 <script setup lang="ts">
 import type { MaFormItem } from '@mineadmin/form'
 import MaDictSelect from '@/components/ma-dict-picker/ma-dict-select.vue'
+import { page as deptList } from '~/base/api/department.ts'
+import MaTree from '@/components/ma-tree/index.vue'
 
 defineOptions({ name: 'DataScope' })
 
 interface DataScopeVo {
-  dataScope: string
+  policy_type: string
   deptIds: number[]
 }
 
-const model = ref<DataScopeVo>({
-  dataScope: '1',
-  deptIds: [],
+const model = defineModel()
+const deptRef = ref()
+const t = useTrans().globalTrans
+const depts = ref<any[]>([])
+
+deptList().then((res) => {
+  depts.value = res.data?.list
+  console.log(depts.value)
 })
 
 const items = ref<MaFormItem[]>([
@@ -20,21 +27,46 @@ const items = ref<MaFormItem[]>([
     prop: 'policy_type',
     render: () => MaDictSelect,
     renderProps: {
+      placeholder: '请选择数据权限',
       data: [
         { label: '全部数据权限', value: 'ALL' },
         { label: '本部门数据权限', value: 'DEPT_SELF' },
         { label: '本部门及所有子部门数据权限', value: 'DEPT_TREE' },
         { label: '本人数据权限', value: 'SELF' },
         { label: '自选部门数据权限', value: 'CUSTOM_DEPT' },
-        { label: '自定义数据权限', value: 'CUSTOM_FUNC' },
+        { label: '自定义函数数据权限', value: 'CUSTOM_FUNC' },
       ],
     },
   },
+  {
+    label: '自选部门',
+    prop: 'deptIds',
+    show: (item, model) => model.policy_type === 'CUSTOM_DEPT',
+    render: () => MaTree,
+    renderProps: {
+      ref: (el: any) => deptRef.value = el,
+      class: 'w-full',
+      showCheckbox: true,
+      treeKey: 'name',
+      placeholder: t('form.pleaseSelect', { msg: t('baseRoleManage.permission') }),
+      nodeKey: 'name',
+      data: depts,
+    },
+  },
+  {
+    label: '调用函数名',
+    prop: 'value',
+    show: (item, model) => model.policy_type === 'CUSTOM_FUNC',
+    render: 'input',
+    renderProps: {
+      placeholder: '请输入调用函数名',
+    },
+  },
 ])
 </script>
 
 <template>
-  <ma-form v-model="model" :items="items" />
+  <ma-form v-model="model" :items="items" :options="{ labelWidth: '90px' }" />
 </template>
 
 <style scoped lang="scss">
diff --git a/web/src/modules/base/views/permission/department/position.vue b/web/src/modules/base/views/permission/department/position.vue
index c3df4756a..38b5a9b4d 100644
--- a/web/src/modules/base/views/permission/department/position.vue
+++ b/web/src/modules/base/views/permission/department/position.vue
@@ -34,6 +34,7 @@ const positionForm = ref<MaFormExpose>()
 const postModel = ref<PositionVo>({
   dept_id: data?.id,
   dept_name: data?.name,
+  policy: {},
 })
 
 const msg = useMessage()
@@ -219,7 +220,7 @@ onMounted(() => {
           },
         ]"
       />
-      <DataScope />
+      <DataScope v-model="postModel.policy" />
     </template>
   </component>
 </template>

From 576611ce291284a8091b231f3bf98d1b8473ce53 Mon Sep 17 00:00:00 2001
From: "X.Mo" <root@imoi.cn>
Date: Wed, 9 Apr 2025 17:08:58 +0800
Subject: [PATCH 33/91] =?UTF-8?q?=E9=83=A8=E9=97=A8=E5=B2=97=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...hGrantDataPermissionForPositionRequest.php |   1 -
 app/Repository/Permission/RoleRepository.php  |   3 +-
 databases/seeders/menu_seeder_20240926.php    | 101 ------------------
 databases/seeders/user_dept_20250310.php      |  10 ++
 web/src/layouts/provider.tsx                  |   3 +-
 web/src/locales/en[English].yaml              |   7 ++
 ...344\275\223\344\270\255\346\226\207].yaml" |   7 ++
 ...351\253\224\344\270\255\346\226\207].yaml" |   7 ++
 web/src/modules/base/api/position.ts          |   6 +-
 web/src/modules/base/locales/en[English].yaml |  10 ++
 ...344\275\223\344\270\255\346\226\207].yaml" |  25 ++++-
 ...351\253\224\344\270\255\346\226\207].yaml" |  10 ++
 .../views/permission/component/dataScope.vue  |  45 ++++----
 .../department/data/getTableColumns.tsx       |   5 +-
 .../views/permission/department/index.vue     |   2 +-
 .../views/permission/department/position.vue  |  66 ++++++++++--
 .../provider/dictionary/data/data-scope.ts    |  19 ++++
 17 files changed, 184 insertions(+), 143 deletions(-)
 create mode 100644 web/src/provider/dictionary/data/data-scope.ts

diff --git a/app/Http/Admin/Request/Permission/BatchGrantDataPermissionForPositionRequest.php b/app/Http/Admin/Request/Permission/BatchGrantDataPermissionForPositionRequest.php
index d7f70ae24..f90e445dc 100644
--- a/app/Http/Admin/Request/Permission/BatchGrantDataPermissionForPositionRequest.php
+++ b/app/Http/Admin/Request/Permission/BatchGrantDataPermissionForPositionRequest.php
@@ -17,7 +17,6 @@ public function rules(): array
             'policy_type' => [
                 'required',
                 'string',
-                'max:10',
                 Rule::enum(PolicyType::class),
             ],
             'value' => [
diff --git a/app/Repository/Permission/RoleRepository.php b/app/Repository/Permission/RoleRepository.php
index 91d240802..4a894edeb 100644
--- a/app/Repository/Permission/RoleRepository.php
+++ b/app/Repository/Permission/RoleRepository.php
@@ -37,7 +37,6 @@ public function handleSearch(Builder $query, array $params): Builder
             })
             ->when(Arr::get($params, 'created_at'), static function (Builder $query, $createdAt) {
                 $query->whereBetween('created_at', $createdAt);
-            })
-            ->with(['policy']);
+            });
     }
 }
diff --git a/databases/seeders/menu_seeder_20240926.php b/databases/seeders/menu_seeder_20240926.php
index 95b2de4f7..fa3dc20a0 100644
--- a/databases/seeders/menu_seeder_20240926.php
+++ b/databases/seeders/menu_seeder_20240926.php
@@ -354,107 +354,6 @@ public function data(): array
                     ],
                 ],
             ],
-            /* [
-                'name' => '工具',
-                'code' => 'devTools',
-                'icon' => 'ma-icon-tool',
-                'path' => 'devTools',
-                'hidden' => '2',
-                'type' => 'M',
-                'children' => [
-                    [
-                        'name' => '代码生成器',
-                        'code' => 'setting:code',
-                        'icon' => 'ma-icon-code',
-                        'path' => 'code',
-                        'component' => 'setting/code/index',
-                        'hidden' => '2',
-                        'type' => 'M',
-                        'children' => [
-                            [
-                                'name' => '预览代码',
-                                'code' => 'setting:code:preview',
-                                'type' => 'B',
-                            ],
-                            [
-                                'name' => '装载数据表',
-                                'code' => 'setting:code:loadTable',
-                                'type' => 'B',
-                            ],
-                            [
-                                'name' => '删除业务表',
-                                'code' => 'setting:code:delete',
-                                'type' => 'B',
-                            ],
-                            [
-                                'name' => '同步业务表',
-                                'code' => 'setting:code:sync',
-                                'type' => 'B',
-                            ],
-                            [
-                                'name' => '生成代码',
-                                'code' => 'setting:code:generate',
-                                'type' => 'B',
-                            ],
-                        ],
-                    ],
-                    [
-                        'name' => '数据源管理',
-                        'code' => 'setting:datasource',
-                        'icon' => 'icon-storage',
-                        'path' => 'setting/datasource',
-                        'component' => 'setting/datasource/index',
-                        'hidden' => '2',
-                        'type' => 'M',
-                        'children' => [
-                            [
-                                'name' => '数据源管理列表',
-                                'code' => 'setting:datasource:index',
-                                'type' => 'B',
-                            ],
-                            [
-                                'name' => '数据源管理保存',
-                                'code' => 'setting:datasource:save',
-                                'type' => 'B',
-                            ],
-                            [
-                                'name' => '数据源管理更新',
-                                'code' => 'setting:datasource:update',
-                                'type' => 'B',
-                            ],
-                            [
-                                'name' => '数据源管理读取',
-                                'code' => 'setting:datasource:read',
-                                'type' => 'B',
-                            ],
-                            [
-                                'name' => '数据源管理删除',
-                                'code' => 'setting:datasource:delete',
-                                'type' => 'B',
-                            ],
-                            [
-                                'name' => '数据源管理导入',
-                                'code' => 'setting:datasource:import',
-                                'type' => 'B',
-                            ],
-                            [
-                                'name' => '数据源管理导出',
-                                'code' => 'setting:datasource:export',
-                                'type' => 'B',
-                            ],
-                        ],
-                    ],
-                    [
-                        'name' => '系统接口',
-                        'code' => 'systemInterface',
-                        'icon' => 'icon-compass',
-                        'path' => 'systemInterface',
-                        'component' => 'setting/systemInterface/index',
-                        'hidden' => '2',
-                        'type' => 'M',
-                    ],
-                ],
-            ],*/
         ];
     }
 
diff --git a/databases/seeders/user_dept_20250310.php b/databases/seeders/user_dept_20250310.php
index d233e8c94..adf6c0f3b 100644
--- a/databases/seeders/user_dept_20250310.php
+++ b/databases/seeders/user_dept_20250310.php
@@ -45,12 +45,22 @@ public function run()
             'permission:department:save'   =>  '部门新增',
             'permission:department:update' =>  '部门编辑',
             'permission:department:delete' =>  '部门删除',
+            'permission:position:index'  => '岗位列表',
+            'permission:position:save'   =>  '岗位新增',
+            'permission:position:update' =>  '岗位编辑',
+            'permission:position:delete' =>  '岗位删除',
+            'permission:position:data_permission' =>  '设置岗位数据权限',
         ];
         $i18n = [
             'baseMenu.permission.departmentList',
             'baseMenu.permission.departmentCreate',
             'baseMenu.permission.departmentSave',
             'baseMenu.permission.departmentDelete',
+            'baseMenu.permission.positionList',
+            'baseMenu.permission.positionCreate',
+            'baseMenu.permission.positionSave',
+            'baseMenu.permission.positionDelete',
+            'baseMenu.permission.positionDataScope',
         ];
         $i = 0;
         foreach ($children as $child => $title) {
diff --git a/web/src/layouts/provider.tsx b/web/src/layouts/provider.tsx
index 85fc67a16..845279dce 100644
--- a/web/src/layouts/provider.tsx
+++ b/web/src/layouts/provider.tsx
@@ -25,10 +25,11 @@ export default defineComponent({
     }
     const userStore = useUserStore()
     useMenuStore().init()
+    userStore.setLanguage(userStore.getLanguage() ?? 'zh_CN')
     const attrsMerged: any = ref(merge({ locale: locales[userStore.getLanguage()], button: { autoInsertSpace: true } }, attrs))
     watch(() => userStore.getLanguage(), (lang: string) => {
       attrsMerged.value.locale = locales[lang]
-    })
+    }, { immediate: true })
 
     onMounted(async () => await usePluginStore().callHooks('setup'))
     return () => (
diff --git a/web/src/locales/en[English].yaml b/web/src/locales/en[English].yaml
index e9f95c03d..c111918b4 100644
--- a/web/src/locales/en[English].yaml
+++ b/web/src/locales/en[English].yaml
@@ -175,3 +175,10 @@ dictionary:
   base:
     systemUser: System user
     normalUser: Normal user
+  dataScope:
+    all: Full data permissions
+    deptSelf: Current department data permissions
+    deptTree: Current department and all sub-departments data permissions
+    self: Personal data permissions
+    customDept: Custom department selection data permissions
+    customFunc: Custom function data permissions
diff --git "a/web/src/locales/zh_CN[\347\256\200\344\275\223\344\270\255\346\226\207].yaml" "b/web/src/locales/zh_CN[\347\256\200\344\275\223\344\270\255\346\226\207].yaml"
index 91fba092f..ff6f3ec3c 100644
--- "a/web/src/locales/zh_CN[\347\256\200\344\275\223\344\270\255\346\226\207].yaml"
+++ "b/web/src/locales/zh_CN[\347\256\200\344\275\223\344\270\255\346\226\207].yaml"
@@ -175,3 +175,10 @@ dictionary:
   base:
     systemUser: 系统用户
     normalUser: 普通用户
+  dataScope:
+    all: 全部数据权限
+    deptSelf: 本部门数据权限
+    deptTree: 本部门及所有子部门数据权限
+    self: 本人数据权限
+    customDept: 自选部门数据权限
+    customFunc: 自定义函数数据权限
diff --git "a/web/src/locales/zh_TW[\347\271\201\351\253\224\344\270\255\346\226\207].yaml" "b/web/src/locales/zh_TW[\347\271\201\351\253\224\344\270\255\346\226\207].yaml"
index f105f18c8..81264ad1b 100644
--- "a/web/src/locales/zh_TW[\347\271\201\351\253\224\344\270\255\346\226\207].yaml"
+++ "b/web/src/locales/zh_TW[\347\271\201\351\253\224\344\270\255\346\226\207].yaml"
@@ -175,3 +175,10 @@ dictionary:
   base:
     systemUser: 系統用戶
     normalUser: 普通用戶
+  dataScope:
+    all: 全部數據權限
+    deptSelf: 本部門數據權限
+    deptTree: 本部門及所有子部門數據權限
+    self: 本人數據權限
+    customDept: 自選部門數據權限
+    customFunc: 自定義數據權限
diff --git a/web/src/modules/base/api/position.ts b/web/src/modules/base/api/position.ts
index 893df8662..0069e11b8 100644
--- a/web/src/modules/base/api/position.ts
+++ b/web/src/modules/base/api/position.ts
@@ -14,7 +14,7 @@ export interface PositionVo {
   dept_id?: number
   dept_name?: string
   name?: string
-  policy?: string
+  [key: string]: any
 }
 
 export interface PositionSearchVo {
@@ -34,6 +34,10 @@ export function save(id: number, data: PositionVo): Promise<ResponseStruct<null>
   return useHttp().put(`/admin/position/${id}`, data)
 }
 
+export function setDataScope(id: number, data: PositionVo): Promise<ResponseStruct<null>> {
+  return useHttp().put(`/admin/position/${id}/data_permission`, data)
+}
+
 export function deleteByIds(ids: number[]): Promise<ResponseStruct<null>> {
   return useHttp().delete('/admin/position', { data: ids })
 }
diff --git a/web/src/modules/base/locales/en[English].yaml b/web/src/modules/base/locales/en[English].yaml
index 6fdcfcb98..2023eb208 100644
--- a/web/src/modules/base/locales/en[English].yaml
+++ b/web/src/modules/base/locales/en[English].yaml
@@ -114,6 +114,16 @@ baseMenu:
     menuSave: Menu save
     menuUpdate: Menu updated
     menuDelete: Menu delete
+    department: Department Management
+    departmentList: Department list
+    departmentCreate: Add department
+    departmentSave: Edit department
+    departmentDelete: Delete department
+    positionList: Post list
+    positionCreate: Add post
+    positionSave: Edit post
+    positionDelete: Delete post
+    positionDataScope: Set post data scope
   log:
     index: Log Management
     userLoginLog: Login Log
diff --git "a/web/src/modules/base/locales/zh_CN[\347\256\200\344\275\223\344\270\255\346\226\207].yaml" "b/web/src/modules/base/locales/zh_CN[\347\256\200\344\275\223\344\270\255\346\226\207].yaml"
index e81730fc9..6c7aa13e8 100644
--- "a/web/src/modules/base/locales/zh_CN[\347\256\200\344\275\223\344\270\255\346\226\207].yaml"
+++ "b/web/src/modules/base/locales/zh_CN[\347\256\200\344\275\223\344\270\255\346\226\207].yaml"
@@ -132,7 +132,9 @@ baseDepartment:
   name: 部门名称
   created_at: 创建时间
   updated_at: 更新时间
-  parentDepartment: 上级部门
+  leaderCount: 负责人数
+  positionsCount: 岗位数
+  usersCount: 人员数
   page:
     mainTitle: 部门管理
     subTitle: 提供公司、机构的人员部门管理、以及部门负责人。
@@ -142,6 +144,22 @@ baseDepartment:
   placeholder:
     name: 请输入部门名称
     parentDepartment: 请选择上级部门
+basePost:
+  name: 岗位名称
+  belongPost: 所属岗位
+  created_at: 创建时间
+  updated_at: 更新时间
+  dataScope: 数据权限
+  selectDept: 自选部门
+  callFunc: 调用函数名
+  page:
+    mainTitle: 部门管理
+    subTitle: 提供公司、机构的人员部门管理、以及部门负责人。
+    setLeader: 设置负责人
+    manageUser: 管理用户
+    managePost: 管理岗位
+  placeholder:
+    name: 请输入岗位名称
 baseMenu:
   permission:
     index: 权限管理
@@ -170,6 +188,11 @@ baseMenu:
     departmentCreate: 新增部门
     departmentSave: 编辑部门
     departmentDelete: 删除部门
+    positionList: 岗位列表
+    positionCreate: 新增岗位
+    positionSave: 编辑岗位
+    positionDelete: 删除岗位
+    positionDataScope: 设置岗位数据权限
   log:
     index: 日志管理
     userLoginLog: 登录日志
diff --git "a/web/src/modules/base/locales/zh_TW[\347\271\201\351\253\224\344\270\255\346\226\207].yaml" "b/web/src/modules/base/locales/zh_TW[\347\271\201\351\253\224\344\270\255\346\226\207].yaml"
index f7db1ac2e..75fcc4ccb 100644
--- "a/web/src/modules/base/locales/zh_TW[\347\271\201\351\253\224\344\270\255\346\226\207].yaml"
+++ "b/web/src/modules/base/locales/zh_TW[\347\271\201\351\253\224\344\270\255\346\226\207].yaml"
@@ -114,6 +114,16 @@ baseMenu:
     menuSave: 菜單管保存
     menuUpdate: 菜單管更新
     menuDelete: 菜單管刪除
+    department: 部門管理
+    departmentList: 部門列表
+    departmentCreate: 新增部門
+    departmentSave: 編輯部門
+    departmentDelete: 刪除部門
+    positionList: 岗位列表
+    positionCreate: 新增岗位
+    positionSave: 編輯岗位
+    positionDelete: 刪除岗位
+    positionDataScope: 設置岗位數據權限
   log:
     index: 日志管理
     userLoginLog: 登錄日志
diff --git a/web/src/modules/base/views/permission/component/dataScope.vue b/web/src/modules/base/views/permission/component/dataScope.vue
index 9b684d30d..60882e41a 100644
--- a/web/src/modules/base/views/permission/component/dataScope.vue
+++ b/web/src/modules/base/views/permission/component/dataScope.vue
@@ -6,10 +6,7 @@ import MaTree from '@/components/ma-tree/index.vue'
 
 defineOptions({ name: 'DataScope' })
 
-interface DataScopeVo {
-  policy_type: string
-  deptIds: number[]
-}
+const { label = '名称' } = defineProps<{ label?: string }>()
 
 const model = defineModel()
 const deptRef = ref()
@@ -18,51 +15,53 @@ const depts = ref<any[]>([])
 
 deptList().then((res) => {
   depts.value = res.data?.list
-  console.log(depts.value)
 })
 
 const items = ref<MaFormItem[]>([
   {
-    label: '数据权限',
+    label: () => label,
+    prop: 'name',
+    render: 'input',
+    renderProps: {
+      disabled: true,
+    },
+  },
+  {
+    label: () => t('basePost.dataScope'),
     prop: 'policy_type',
     render: () => MaDictSelect,
     renderProps: {
-      placeholder: '请选择数据权限',
-      data: [
-        { label: '全部数据权限', value: 'ALL' },
-        { label: '本部门数据权限', value: 'DEPT_SELF' },
-        { label: '本部门及所有子部门数据权限', value: 'DEPT_TREE' },
-        { label: '本人数据权限', value: 'SELF' },
-        { label: '自选部门数据权限', value: 'CUSTOM_DEPT' },
-        { label: '自定义函数数据权限', value: 'CUSTOM_FUNC' },
-      ],
+      placeholder: t('form.pleaseSelect', { msg: t('basePost.dataScope') }),
+      dictName: 'data-scope',
     },
   },
   {
-    label: '自选部门',
-    prop: 'deptIds',
+    label: () => t('basePost.selectDept'),
+    prop: 'value',
     show: (item, model) => model.policy_type === 'CUSTOM_DEPT',
     render: () => MaTree,
     renderProps: {
       ref: (el: any) => deptRef.value = el,
       class: 'w-full',
       showCheckbox: true,
-      treeKey: 'name',
-      placeholder: t('form.pleaseSelect', { msg: t('baseRoleManage.permission') }),
-      nodeKey: 'name',
+      props: { label: 'name' },
+      placeholder: t('form.pleaseSelect', { msg: t('basePost.selectDept') }),
+      nodeKey: 'id',
       data: depts,
     },
   },
   {
-    label: '调用函数名',
-    prop: 'value',
+    label: () => t('basePost.callFunc'),
+    prop: 'func_name',
     show: (item, model) => model.policy_type === 'CUSTOM_FUNC',
     render: 'input',
     renderProps: {
-      placeholder: '请输入调用函数名',
+      placeholder: t('form.pleaseInput', { msg: t('basePost.callFunc') }),
     },
   },
 ])
+
+defineExpose({ deptRef })
 </script>
 
 <template>
diff --git a/web/src/modules/base/views/permission/department/data/getTableColumns.tsx b/web/src/modules/base/views/permission/department/data/getTableColumns.tsx
index 0218a9c83..d32e4e592 100644
--- a/web/src/modules/base/views/permission/department/data/getTableColumns.tsx
+++ b/web/src/modules/base/views/permission/department/data/getTableColumns.tsx
@@ -27,6 +27,9 @@ export default function getTableColumns(dialog: UseDialogExpose, formRef: any, t
     { type: 'selection', showOverflowTooltip: false, label: () => t('crud.selection') },
     // 普通列
     { label: () => t('baseDepartment.name'), prop: 'name', align: 'left' },
+    { label: () => t('baseDepartment.leaderCount'), prop: 'leader', cellRender: ({ row }) => row.leader?.length ?? 0 },
+    { label: () => t('baseDepartment.positionsCount'), prop: 'positions', cellRender: ({ row }) => row.positions?.length ?? 0 },
+    { label: () => t('baseDepartment.usersCount'), prop: 'users', cellRender: ({ row }) => row.users?.length ?? 0 },
     { label: () => t('baseDepartment.created_at'), prop: 'created_at', width: 200 },
     { label: () => t('baseDepartment.updated_at'), prop: 'updated_at', width: 200 },
 
@@ -60,7 +63,7 @@ export default function getTableColumns(dialog: UseDialogExpose, formRef: any, t
           {
             name: 'managePost',
             icon: 'material-symbols:position-bottom-right-outline-rounded',
-            show: () => showBtn('permission:department:update'),
+            show: () => showBtn('permission:position:index'),
             text: () => t('baseDepartment.page.managePost'),
             onClick: ({ row }) => {
               dialog.setAttr({ width: '55%' })
diff --git a/web/src/modules/base/views/permission/department/index.vue b/web/src/modules/base/views/permission/department/index.vue
index d2edcc8c7..1015c3708 100644
--- a/web/src/modules/base/views/permission/department/index.vue
+++ b/web/src/modules/base/views/permission/department/index.vue
@@ -205,7 +205,7 @@ function expandToggle() {
     <component :is="maDialog.Dialog">
       <template #default="{ formType, data }">
         <!-- 新增、编辑表单 -->
-        <DepartmentForm v-if="formType.includes('add', 'edit')" ref="formRef" :form-type="formType" :data="data" />
+        <DepartmentForm v-if="['add', 'edit'].includes(formType)" ref="formRef" :form-type="formType" :data="data" />
         <!-- 设置部门领导 -->
         <!--        <SetLeader v-if="formType === 'setLeader'" ref="setLeaderRef" :data="data" /> -->
         <!-- 管理部门岗位 -->
diff --git a/web/src/modules/base/views/permission/department/position.vue b/web/src/modules/base/views/permission/department/position.vue
index 38b5a9b4d..12d9d1477 100644
--- a/web/src/modules/base/views/permission/department/position.vue
+++ b/web/src/modules/base/views/permission/department/position.vue
@@ -11,7 +11,8 @@
 <script setup lang="tsx">
 import type { DepartmentVo } from '~/base/api/department.ts'
 import type { PositionVo } from '~/base/api/position.ts'
-import { create, deleteByIds, page, save } from '~/base/api/position.ts'
+import { create, deleteByIds, page, save, setDataScope } from '~/base/api/position.ts'
+
 import type { MaProTableExpose, MaProTableOptions, MaProTableSchema } from '@mineadmin/pro-table'
 import type { MaFormExpose } from '@mineadmin/form'
 import type { TransType } from '@/hooks/auto-imports/useTrans.ts'
@@ -22,19 +23,23 @@ import hasAuth from '@/utils/permission/hasAuth.ts'
 import { ResultCode } from '@/utils/ResultCode.ts'
 
 import DataScope from '~/base/views/permission/component/dataScope.vue'
+import { ElTag } from 'element-plus'
 
 const { data = null } = defineProps<{
   data?: DepartmentVo | null
 }>()
 
+const dictStore = useDictStore()
+
 const i18n = useTrans() as TransType
 const t = i18n.globalTrans
 const proTableRef = ref<MaProTableExpose>()
+const scopeRef = ref()
 const positionForm = ref<MaFormExpose>()
 const postModel = ref<PositionVo>({
   dept_id: data?.id,
   dept_name: data?.name,
-  policy: {},
+  policy_type: '',
 })
 
 const msg = useMessage()
@@ -76,6 +81,19 @@ const maDialog: UseDialogExpose = useDialog({
         }
       }).catch()
     }
+    else if (formType === 'setDataScope') {
+      if (postModel.value.policy_type === 'CUSTOM_FUNC') {
+        postModel.value.value = [postModel.value.func_name]
+      }
+      if (postModel.value.policy_type === 'CUSTOM_DEPT') {
+        postModel.value.value = scopeRef.value.deptRef.elTree?.getCheckedKeys()
+      }
+      setDataScope(postModel.value?.id as number, postModel.value).then((res: any) => {
+        res.code === ResultCode.SUCCESS ? msg.success(t('crud.updateSuccess')) : msg.error(res.message)
+        maDialog.close()
+        proTableRef.value?.refresh()
+      })
+    }
     okLoadingState(false)
   },
 })
@@ -118,11 +136,27 @@ const schema = ref<MaProTableSchema>({
     // 多选列
     { type: 'selection', showOverflowTooltip: false, label: () => t('crud.selection') },
     {
-      label: '岗位名称',
+      label: () => t('basePost.name'),
       prop: 'name',
       align: 'left',
-    }, {
-      label: '创建时间',
+    },
+    {
+      label: () => t('basePost.dataScope'),
+      prop: 'policy',
+      align: 'center',
+      cellRender: ({ row }) => {
+        if (!row.policy) {
+          return '-'
+        }
+        return h(
+          ElTag,
+          { type: dictStore.t('data-scope', row.policy.policy_type, 'color') },
+          dictStore.t('data-scope', row.policy.policy_type),
+        )
+      },
+    },
+    {
+      label: () => t('basePost.created_at'),
       prop: 'created_at',
       width: 180,
     },
@@ -130,19 +164,28 @@ const schema = ref<MaProTableSchema>({
     {
       type: 'operation',
       label: () => t('crud.operation'),
-      width: '280px',
       operationConfigure: {
-        type: 'tile',
         actions: [
           {
             name: 'dataScope',
             icon: 'mdi:sort-variant-lock-open',
-            show: () => showBtn('permission:position:update'),
+            show: () => showBtn('permission:position:data_permission'),
             text: () => t('baseUserManage.setDataScope'),
             onClick: ({ row }) => {
-              Object.keys(row).map((key: string) => postModel.value[key] = row[key])
+              postModel.value.id = row.id
+              postModel.value.name = row.name
               maDialog.setTitle(t('baseUserManage.setDataScope'))
               maDialog.open({ formType: 'setDataScope' })
+              postModel.value.policy_type = row?.policy?.policy_type ?? undefined
+              if (postModel.value.policy_type === 'CUSTOM_FUNC') {
+                postModel.value.func_name = row.policy.value
+              }
+              if (postModel.value.policy_type === 'CUSTOM_DEPT') {
+                nextTick(() => {
+                  postModel.value.value = row.policy.value
+                  scopeRef.value.deptRef.elTree?.setCheckedKeys(row.policy.value, true)
+                })
+              }
             },
           },
           {
@@ -153,7 +196,7 @@ const schema = ref<MaProTableSchema>({
             onClick: ({ row }) => {
               Object.keys(row).map((key: string) => postModel.value[key] = row[key])
               maDialog.setTitle(t('crud.edit'))
-              maDialog.open({ formType: 'edit' })
+              maDialog.open({ formType: 'edit', data: row })
             },
           },
           {
@@ -188,6 +231,7 @@ onMounted(() => {
         v-auth="['permission:position:save']"
         type="primary"
         @click="() => {
+          postModel.name = ''
           maDialog.setTitle(t('crud.add'))
           maDialog.open({ formType: 'add' })
         }"
@@ -220,7 +264,7 @@ onMounted(() => {
           },
         ]"
       />
-      <DataScope v-model="postModel.policy" />
+      <DataScope v-if="formType === 'setDataScope'" ref="scopeRef" v-model="postModel" :label="t('basePost.belongPost')" />
     </template>
   </component>
 </template>
diff --git a/web/src/provider/dictionary/data/data-scope.ts b/web/src/provider/dictionary/data/data-scope.ts
new file mode 100644
index 000000000..e87be7eda
--- /dev/null
+++ b/web/src/provider/dictionary/data/data-scope.ts
@@ -0,0 +1,19 @@
+/**
+ * MineAdmin is committed to providing solutions for quickly building web applications
+ * Please view the LICENSE file that was distributed with this source code,
+ * For the full copyright and license information.
+ * Thank you very much for using MineAdmin.
+ *
+ * @Author X.Mo<root@imoi.cn>
+ * @Link   https://github.com/mineadmin
+ */
+import type { Dictionary } from '#/global'
+
+export default [
+  { label: '全部数据权限', value: 'ALL', i18n: 'dictionary.dataScope.all', color: 'primary' },
+  { label: '本部门数据权限', value: 'DEPT_SELF', i18n: 'dictionary.dataScope.deptSelf', color: 'primary' },
+  { label: '本部门及所有子部门数据权限', value: 'DEPT_TREE', i18n: 'dictionary.dataScope.deptTree', color: 'primary' },
+  { label: '本人数据权限', value: 'SELF', i18n: 'dictionary.dataScope.self', color: 'primary' },
+  { label: '自选部门数据权限', value: 'CUSTOM_DEPT', i18n: 'dictionary.dataScope.customDept', color: 'primary' },
+  { label: '自定义函数数据权限', value: 'CUSTOM_FUNC', i18n: 'dictionary.dataScope.customFunc', color: 'primary' },
+] as Dictionary[]

From d528dd8a53fd77cd428835c5ed814f1ad535e1dc Mon Sep 17 00:00:00 2001
From: "X.Mo" <root@imoi.cn>
Date: Wed, 9 Apr 2025 17:21:38 +0800
Subject: [PATCH 34/91] =?UTF-8?q?=E9=83=A8=E9=97=A8=E5=B2=97=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/src/modules/base/locales/en[English].yaml | 13 +++++++++++-
 ...344\275\223\344\270\255\346\226\207].yaml" |  7 +------
 ...351\253\224\344\270\255\346\226\207].yaml" | 21 ++++++++++++++-----
 .../views/permission/department/position.vue  | 14 ++++++-------
 4 files changed, 36 insertions(+), 19 deletions(-)

diff --git a/web/src/modules/base/locales/en[English].yaml b/web/src/modules/base/locales/en[English].yaml
index 2023eb208..c164c33e3 100644
--- a/web/src/modules/base/locales/en[English].yaml
+++ b/web/src/modules/base/locales/en[English].yaml
@@ -114,7 +114,7 @@ baseMenu:
     menuSave: Menu save
     menuUpdate: Menu updated
     menuDelete: Menu delete
-    department: Department Management
+    department: Department
     departmentList: Department list
     departmentCreate: Add department
     departmentSave: Edit department
@@ -124,6 +124,17 @@ baseMenu:
     positionSave: Edit post
     positionDelete: Delete post
     positionDataScope: Set post data scope
+basePost:
+  name: Post Name
+  belongPost: Belongs to Position
+  belongDept: Belongs to Department
+  created_at: Creation Time
+  updated_at: Update Time
+  dataScope: Data Permissions
+  selectDept: Selected Departments
+  callFunc: Function Call Name
+  placeholder:
+    name: Please enter position name
   log:
     index: Log Management
     userLoginLog: Login Log
diff --git "a/web/src/modules/base/locales/zh_CN[\347\256\200\344\275\223\344\270\255\346\226\207].yaml" "b/web/src/modules/base/locales/zh_CN[\347\256\200\344\275\223\344\270\255\346\226\207].yaml"
index 6c7aa13e8..abc275a7e 100644
--- "a/web/src/modules/base/locales/zh_CN[\347\256\200\344\275\223\344\270\255\346\226\207].yaml"
+++ "b/web/src/modules/base/locales/zh_CN[\347\256\200\344\275\223\344\270\255\346\226\207].yaml"
@@ -147,17 +147,12 @@ baseDepartment:
 basePost:
   name: 岗位名称
   belongPost: 所属岗位
+  belongDept: 所属部门
   created_at: 创建时间
   updated_at: 更新时间
   dataScope: 数据权限
   selectDept: 自选部门
   callFunc: 调用函数名
-  page:
-    mainTitle: 部门管理
-    subTitle: 提供公司、机构的人员部门管理、以及部门负责人。
-    setLeader: 设置负责人
-    manageUser: 管理用户
-    managePost: 管理岗位
   placeholder:
     name: 请输入岗位名称
 baseMenu:
diff --git "a/web/src/modules/base/locales/zh_TW[\347\271\201\351\253\224\344\270\255\346\226\207].yaml" "b/web/src/modules/base/locales/zh_TW[\347\271\201\351\253\224\344\270\255\346\226\207].yaml"
index 75fcc4ccb..8bf2c041a 100644
--- "a/web/src/modules/base/locales/zh_TW[\347\271\201\351\253\224\344\270\255\346\226\207].yaml"
+++ "b/web/src/modules/base/locales/zh_TW[\347\271\201\351\253\224\344\270\255\346\226\207].yaml"
@@ -119,11 +119,22 @@ baseMenu:
     departmentCreate: 新增部門
     departmentSave: 編輯部門
     departmentDelete: 刪除部門
-    positionList: 岗位列表
-    positionCreate: 新增岗位
-    positionSave: 編輯岗位
-    positionDelete: 刪除岗位
-    positionDataScope: 設置岗位數據權限
+    positionList: 職位列表
+    positionCreate: 新增職位
+    positionSave: 編輯職位
+    positionDelete: 刪除職位
+    positionDataScope: 設置職位數據權限
+basePost:
+  name: 職位名稱
+  belongPost: 所屬職位
+  belongDept: 所屬部門
+  created_at: 創建時間
+  updated_at: 更新時間
+  dataScope: 數據權限
+  selectDept: 自選部門
+  callFunc: 調用函數名
+  placeholder:
+    name: 請輸入職位名稱
   log:
     index: 日志管理
     userLoginLog: 登錄日志
diff --git a/web/src/modules/base/views/permission/department/position.vue b/web/src/modules/base/views/permission/department/position.vue
index 12d9d1477..c3e330405 100644
--- a/web/src/modules/base/views/permission/department/position.vue
+++ b/web/src/modules/base/views/permission/department/position.vue
@@ -130,7 +130,7 @@ const options = ref<MaProTableOptions>({
 // 架构配置
 const schema = ref<MaProTableSchema>({
   // 搜索项
-  searchItems: [{ label: '岗位名称', prop: 'name', render: 'input' }],
+  searchItems: [{ label: () => t('basePost.name'), prop: 'name', render: 'input' }],
   // 表格列
   tableColumns: [
     // 多选列
@@ -151,7 +151,7 @@ const schema = ref<MaProTableSchema>({
         return h(
           ElTag,
           { type: dictStore.t('data-scope', row.policy.policy_type, 'color') },
-          dictStore.t('data-scope', row.policy.policy_type),
+          t(dictStore.t('data-scope', row.policy.policy_type, 'i18n')),
         )
       },
     },
@@ -247,20 +247,20 @@ onMounted(() => {
         v-if="['add', 'edit'].includes(formType)"
         ref="positionForm"
         v-model="postModel"
-        :options="{ labelWidth: 90 }"
+        :options="{ labelWidth: 95 }"
         :items="[
           {
-            label: '所属部门',
+            label: () => '所属部门',
             prop: 'dept_name',
             render: 'input',
             renderProps: { disabled: true },
           },
           {
-            label: '岗位名称',
+            label: () => t('basePost.name'),
             prop: 'name',
             render: 'input',
-            renderProps: { placeholder: '请输入岗位名称' },
-            itemProps: { rules: [{ required: true, message: '岗位名称必填' }] },
+            renderProps: { placeholder: t('form.pleaseInput', { msg: t('basePost.name') }) },
+            itemProps: { rules: [{ required: true, message: t('form.requiredInput', { msg: t('basePost.placeholder.name') }) }] },
           },
         ]"
       />

From 4fd68e6635060684ccf4c3661d29f14527bcefca Mon Sep 17 00:00:00 2001
From: "X.Mo" <root@imoi.cn>
Date: Tue, 15 Apr 2025 17:15:01 +0800
Subject: [PATCH 35/91] =?UTF-8?q?=E9=83=A8=E9=97=A8=E9=A2=86=E5=AF=BC?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Permission/LeaderController.php           | 121 +++++++
 .../Request/Permission/LeaderRequest.php      |  51 +++
 app/Model/Permission/Leader.php               |  60 ++++
 .../Permission/LeaderRepository.php           |  45 +++
 app/Schema/LeaderSchema.php                   |  49 +++
 app/Service/Permission/LeaderService.php      |  27 ++
 databases/seeders/user_dept_20250310.php      |   8 +
 ...344\275\223\344\270\255\346\226\207].yaml" |   9 +-
 .../department/data/getFormItems.tsx          |  13 +-
 .../department/data/getTableColumns.tsx       |  25 +-
 .../base/views/permission/department/form.vue |   4 +-
 .../views/permission/department/index.vue     |   7 +-
 .../views/permission/department/setLeader.vue | 315 ++++++++++++++----
 13 files changed, 644 insertions(+), 90 deletions(-)
 create mode 100644 app/Http/Admin/Controller/Permission/LeaderController.php
 create mode 100644 app/Http/Admin/Request/Permission/LeaderRequest.php
 create mode 100644 app/Model/Permission/Leader.php
 create mode 100644 app/Repository/Permission/LeaderRepository.php
 create mode 100644 app/Schema/LeaderSchema.php
 create mode 100644 app/Service/Permission/LeaderService.php

diff --git a/app/Http/Admin/Controller/Permission/LeaderController.php b/app/Http/Admin/Controller/Permission/LeaderController.php
new file mode 100644
index 000000000..e36928565
--- /dev/null
+++ b/app/Http/Admin/Controller/Permission/LeaderController.php
@@ -0,0 +1,121 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * This file is part of MineAdmin.
+ *
+ * @link     https://www.mineadmin.com
+ * @document https://doc.mineadmin.com
+ * @contact  root@imoi.cn
+ * @license  https://github.com/mineadmin/MineAdmin/blob/master/LICENSE
+ */
+
+namespace App\Http\Admin\Controller\Permission;
+
+use App\Http\Admin\Controller\AbstractController;
+use App\Http\Admin\Middleware\PermissionMiddleware;
+use App\Http\Admin\Request\Permission\LeaderRequest;
+use App\Http\Common\Middleware\AccessTokenMiddleware;
+use App\Http\Common\Middleware\OperationMiddleware;
+use App\Http\Common\Result;
+use App\Http\CurrentUser;
+use App\Schema\LeaderSchema;
+use App\Service\Permission\LeaderService;
+use Hyperf\HttpServer\Annotation\Middleware;
+use Hyperf\Swagger\Annotation\Delete;
+use Hyperf\Swagger\Annotation\Get;
+use Hyperf\Swagger\Annotation\HyperfServer;
+use Hyperf\Swagger\Annotation\JsonContent;
+use Hyperf\Swagger\Annotation\Post;
+use Hyperf\Swagger\Annotation\Put;
+use Hyperf\Swagger\Annotation\RequestBody;
+use Mine\Access\Attribute\Permission;
+use Mine\Swagger\Attributes\PageResponse;
+use Mine\Swagger\Attributes\ResultResponse;
+
+#[HyperfServer(name: 'http')]
+#[Middleware(middleware: AccessTokenMiddleware::class, priority: 100)]
+#[Middleware(middleware: PermissionMiddleware::class, priority: 99)]
+#[Middleware(middleware: OperationMiddleware::class, priority: 98)]
+class LeaderController extends AbstractController
+{
+    public function __construct(
+        protected readonly CurrentUser $currentUser,
+        protected readonly LeaderService $service
+    ) {}
+
+    #[Get(
+        path: '/admin/leader/list',
+        operationId: 'leaderList',
+        summary: '部门领导列表',
+        security: [['Bearer' => [], 'ApiKey' => []]],
+        tags: ['部门领导管理'],
+    )]
+    #[PageResponse(instance: LeaderSchema::class)]
+    #[Permission(code: 'permission:leader:index')]
+    public function pageList(): Result
+    {
+        return $this->success(
+            $this->service->page(
+                $this->getRequestData(),
+                $this->getCurrentPage(),
+                $this->getPageSize()
+            )
+        );
+    }
+
+    #[Post(
+        path: '/admin/leader',
+        operationId: 'leaderCreate',
+        summary: '部门领导岗位',
+        security: [['Bearer' => [], 'ApiKey' => []]],
+        tags: ['部门领导管理'],
+    )]
+    #[RequestBody(
+        content: new JsonContent(ref: LeaderRequest::class)
+    )]
+    #[Permission(code: 'permission:leader:save')]
+    #[ResultResponse(instance: new Result())]
+    public function create(LeaderRequest $request): Result
+    {
+        $this->service->create(array_merge($request->validated(), [
+            'created_by' => $this->currentUser->id(),
+        ]));
+        return $this->success();
+    }
+
+    #[Put(
+        path: '/admin/leader/{id}',
+        operationId: 'leaderSave',
+        summary: '编辑部门领导',
+        security: [['Bearer' => [], 'ApiKey' => []]],
+        tags: ['部门领导管理'],
+    )]
+    #[RequestBody(
+        content: new JsonContent(ref: LeaderRequest::class)
+    )]
+    #[Permission(code: 'permission:leader:update')]
+    #[ResultResponse(instance: new Result())]
+    public function save(int $id, LeaderRequest $request): Result
+    {
+        $this->service->updateById($id, array_merge($request->validated(), [
+            'updated_by' => $this->currentUser->id(),
+        ]));
+        return $this->success();
+    }
+
+    #[Delete(
+        path: '/admin/leader',
+        operationId: 'leaderDelete',
+        summary: '删除部门领导',
+        security: [['Bearer' => [], 'ApiKey' => []]],
+        tags: ['部门领导管理'],
+    )]
+    #[ResultResponse(instance: new Result())]
+    #[Permission(code: 'permission:leader:delete')]
+    public function delete(): Result
+    {
+        $this->service->deleteById($this->getRequestData());
+        return $this->success();
+    }
+}
diff --git a/app/Http/Admin/Request/Permission/LeaderRequest.php b/app/Http/Admin/Request/Permission/LeaderRequest.php
new file mode 100644
index 000000000..70b78e80a
--- /dev/null
+++ b/app/Http/Admin/Request/Permission/LeaderRequest.php
@@ -0,0 +1,51 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * This file is part of MineAdmin.
+ *
+ * @link     https://www.mineadmin.com
+ * @document https://doc.mineadmin.com
+ * @contact  root@imoi.cn
+ * @license  https://github.com/mineadmin/MineAdmin/blob/master/LICENSE
+ */
+
+namespace App\Http\Admin\Request\Permission;
+
+use App\Http\Common\Request\Traits\HttpMethodTrait;
+use App\Http\Common\Request\Traits\NoAuthorizeTrait;
+use App\Schema\LeaderSchema;
+use Hyperf\Validation\Request\FormRequest;
+
+#[\Mine\Swagger\Attributes\FormRequest(
+    schema: LeaderSchema::class,
+    only: [
+        'dept_id', 'user_id'
+    ]
+)]
+class LeaderRequest extends FormRequest
+{
+    use HttpMethodTrait;
+    use NoAuthorizeTrait;
+
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    public function rules(): array
+    {
+        return [
+            'user_id' => 'required|string|exists:user,id',
+            'dept_id' => 'required|integer|exists:department,id',
+        ];
+    }
+
+    public function attributes(): array
+    {
+        return [
+            'user_id' => '用户ID',
+            'dept_id' => '部门ID',
+        ];
+    }
+}
diff --git a/app/Model/Permission/Leader.php b/app/Model/Permission/Leader.php
new file mode 100644
index 000000000..1c4985e94
--- /dev/null
+++ b/app/Model/Permission/Leader.php
@@ -0,0 +1,60 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * This file is part of MineAdmin.
+ *
+ * @link     https://www.mineadmin.com
+ * @document https://doc.mineadmin.com
+ * @contact  root@imoi.cn
+ * @license  https://github.com/mineadmin/MineAdmin/blob/master/LICENSE
+ */
+
+namespace App\Model\Permission;
+
+use App\Model\DataPermission\Policy;
+use Carbon\Carbon;
+use Hyperf\Database\Model\Collection;
+use Hyperf\Database\Model\Relations\BelongsTo;
+use Hyperf\Database\Model\Relations\BelongsToMany;
+use Hyperf\Database\Model\SoftDeletes;
+use Hyperf\DbConnection\Model\Model;
+
+/**
+ * @property int $user_id 用户ID
+ * @property int $dept_id 部门ID
+ * @property Carbon $created_at
+ * @property Carbon $updated_at
+ * @property Carbon $deleted_at
+ * @property null|Department $department
+ * @property null|User $user
+ */
+class Leader extends Model
+{
+    use SoftDeletes;
+
+    /**
+     * The table associated with the model.
+     */
+    protected ?string $table = 'leader';
+
+    /**
+     * The attributes that are mass assignable.
+     */
+    protected array $fillable = ['user_id', 'dept_id', 'created_at', 'updated_at', 'deleted_at'];
+
+    /**
+     * The attributes that should be cast to native types.
+     */
+    protected array $casts = ['user_id' => 'integer', 'dept_id' => 'integer', 'created_at' => 'datetime', 'updated_at' => 'datetime', 'deleted_at' => 'datetime'];
+
+    public function department(): BelongsTo
+    {
+        return $this->belongsTo(Department::class, 'dept_id', 'id');
+    }
+
+    public function user(): BelongsTo
+    {
+        return $this->belongsTo(User::class, 'user_id', 'id');
+    }
+}
diff --git a/app/Repository/Permission/LeaderRepository.php b/app/Repository/Permission/LeaderRepository.php
new file mode 100644
index 000000000..f21b81bcc
--- /dev/null
+++ b/app/Repository/Permission/LeaderRepository.php
@@ -0,0 +1,45 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * This file is part of MineAdmin.
+ *
+ * @link     https://www.mineadmin.com
+ * @document https://doc.mineadmin.com
+ * @contact  root@imoi.cn
+ * @license  https://github.com/mineadmin/MineAdmin/blob/master/LICENSE
+ */
+
+namespace App\Repository\Permission;
+
+use App\Model\Permission\Leader;
+use App\Repository\IRepository;
+use Hyperf\Database\Model\Builder;
+
+/**
+ * @extends IRepository<Leader>
+ */
+final class LeaderRepository extends IRepository
+{
+    public function __construct(
+        protected readonly Leader $model
+    ) {}
+
+    public function handleSearch(Builder $query, array $params): Builder
+    {
+        return $query
+            ->when(isset($params['user_id']), static function (Builder $query) use ($params) {
+                $query->where('user_id', $params['user_id']);
+            })
+            ->when(isset($params['dept_id']), static function (Builder $query) use ($params) {
+                $query->where('dept_id', $params['dept_id']);
+            })
+            ->when(isset($params['created_at']), static function (Builder $query) use ($params) {
+                $query->whereBetween('created_at', $params['created_at']);
+            })
+            ->when(isset($params['updated_at']), static function (Builder $query) use ($params) {
+                $query->whereBetween('updated_at', $params['updated_at']);
+            })
+            ->with(['department','user']);
+    }
+}
diff --git a/app/Schema/LeaderSchema.php b/app/Schema/LeaderSchema.php
new file mode 100644
index 000000000..2af7954f5
--- /dev/null
+++ b/app/Schema/LeaderSchema.php
@@ -0,0 +1,49 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * This file is part of MineAdmin.
+ *
+ * @link     https://www.mineadmin.com
+ * @document https://doc.mineadmin.com
+ * @contact  root@imoi.cn
+ * @license  https://github.com/mineadmin/MineAdmin/blob/master/LICENSE
+ */
+
+namespace App\Schema;
+
+use Hyperf\Swagger\Annotation\Property;
+use Hyperf\Swagger\Annotation\Schema;
+
+#[Schema(title: 'LeaderSchema', description: '部门领导模型')]
+class LeaderSchema implements \JsonSerializable
+{
+    #[Property(property: 'dept_id', title: '部门ID', type: 'int')]
+    public ?int $deptId;
+
+    #[Property(property: 'user_id', title: '部门ID', type: 'int')]
+    public ?int $userId;
+
+    #[Property(property: 'created_by', title: '创建者', type: 'int')]
+    public ?int $createdBy;
+
+    #[Property(property: 'updated_by', title: '更新者', type: 'int')]
+    public ?int $updatedBy;
+
+    #[Property(property: 'created_at', title: '创建时间', type: 'string')]
+    public mixed $createdAt;
+
+    #[Property(property: 'updated_at', title: '更新时间', type: 'string')]
+    public mixed $updatedAt;
+
+    #[Property(property: 'department', title: '部门信息', type: 'object', ref: '#/components/schemas/DepartmentSchema')]
+    public ?object $department;
+
+    #[Property(property: 'user', title: '用户信息', type: 'object', ref: '#/components/schemas/UserSchema')]
+    public ?object $user;
+
+    public function jsonSerialize(): mixed
+    {
+        return [];
+    }
+}
diff --git a/app/Service/Permission/LeaderService.php b/app/Service/Permission/LeaderService.php
new file mode 100644
index 000000000..65dbe1392
--- /dev/null
+++ b/app/Service/Permission/LeaderService.php
@@ -0,0 +1,27 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * This file is part of MineAdmin.
+ *
+ * @link     https://www.mineadmin.com
+ * @document https://doc.mineadmin.com
+ * @contact  root@imoi.cn
+ * @license  https://github.com/mineadmin/MineAdmin/blob/master/LICENSE
+ */
+
+namespace App\Service\Permission;
+
+use App\Model\Permission\Position;
+use App\Repository\Permission\LeaderRepository;
+use App\Service\IService;
+
+/**
+ * @extends IService<Position>
+ */
+class LeaderService extends IService
+{
+    public function __construct(
+        protected readonly LeaderRepository $repository
+    ) {}
+}
diff --git a/databases/seeders/user_dept_20250310.php b/databases/seeders/user_dept_20250310.php
index adf6c0f3b..d2c63c901 100644
--- a/databases/seeders/user_dept_20250310.php
+++ b/databases/seeders/user_dept_20250310.php
@@ -50,6 +50,10 @@ public function run()
             'permission:position:update' =>  '岗位编辑',
             'permission:position:delete' =>  '岗位删除',
             'permission:position:data_permission' =>  '设置岗位数据权限',
+            'permission:leader:index'  => '部门领导列表',
+            'permission:leader:save'   =>  '新增部门领导',
+            'permission:leader:update' =>  '更新部门领导',
+            'permission:leader:delete' =>  '部门领导移除',
         ];
         $i18n = [
             'baseMenu.permission.departmentList',
@@ -61,6 +65,10 @@ public function run()
             'baseMenu.permission.positionSave',
             'baseMenu.permission.positionDelete',
             'baseMenu.permission.positionDataScope',
+            'baseMenu.permission.leaderList',
+            'baseMenu.permission.leaderCreate',
+            'baseMenu.permission.leaderSave',
+            'baseMenu.permission.leaderDelete',
         ];
         $i = 0;
         foreach ($children as $child => $title) {
diff --git "a/web/src/modules/base/locales/zh_CN[\347\256\200\344\275\223\344\270\255\346\226\207].yaml" "b/web/src/modules/base/locales/zh_CN[\347\256\200\344\275\223\344\270\255\346\226\207].yaml"
index abc275a7e..c83432be8 100644
--- "a/web/src/modules/base/locales/zh_CN[\347\256\200\344\275\223\344\270\255\346\226\207].yaml"
+++ "b/web/src/modules/base/locales/zh_CN[\347\256\200\344\275\223\344\270\255\346\226\207].yaml"
@@ -135,15 +135,18 @@ baseDepartment:
   leaderCount: 负责人数
   positionsCount: 岗位数
   usersCount: 人员数
+  parentDepartment: 上级部门
   page:
     mainTitle: 部门管理
     subTitle: 提供公司、机构的人员部门管理、以及部门负责人。
     setLeader: 设置负责人
-    manageUser: 管理用户
+    previewUser: 查看用户
     managePost: 管理岗位
   placeholder:
     name: 请输入部门名称
     parentDepartment: 请选择上级部门
+  error:
+    selfNotParent: 不可选择自己作为上级部门，已还原默认数据
 basePost:
   name: 岗位名称
   belongPost: 所属岗位
@@ -188,6 +191,10 @@ baseMenu:
     positionSave: 编辑岗位
     positionDelete: 删除岗位
     positionDataScope: 设置岗位数据权限
+    leaderList: 部门领导列表
+    leaderCreate: 新增部门领导
+    leaderSave: 编辑部门领导
+    leaderDelete: 删除部门领导
   log:
     index: 日志管理
     userLoginLog: 登录日志
diff --git a/web/src/modules/base/views/permission/department/data/getFormItems.tsx b/web/src/modules/base/views/permission/department/data/getFormItems.tsx
index 336ff6c07..28a853880 100644
--- a/web/src/modules/base/views/permission/department/data/getFormItems.tsx
+++ b/web/src/modules/base/views/permission/department/data/getFormItems.tsx
@@ -8,10 +8,12 @@
  * @Link   https://github.com/mineadmin
  */
 import type { MaFormItem } from '@mineadmin/form'
+import { cloneDeep } from 'lodash-es'
 
-export default function getFormItems(formType: 'add' | 'edit' = 'add', t: any, model: any): MaFormItem[] {
+export default function getFormItems(formType: 'add' | 'edit' = 'add', t: any, model: any, msg: any): MaFormItem[] {
   const treeSelectRef = ref()
   const deptList = ref<any[]>([])
+  const sourceModel = cloneDeep(model)
 
   if (formType === 'add') {
     model.parent_id = 0
@@ -24,7 +26,8 @@ export default function getFormItems(formType: 'add' | 'edit' = 'add', t: any, m
 
   return [
     {
-      label: () => t('baseDepartment.parentDepartment'), prop: 'parent_id', render: () => (
+      label: () => t('baseDepartment.parentDepartment'), prop: 'parent_id',
+      render: () => (
         <el-tree-select
           ref={treeSelectRef}
           data={deptList.value}
@@ -32,6 +35,12 @@ export default function getFormItems(formType: 'add' | 'edit' = 'add', t: any, m
           check-strictly={true}
           default-expand-all={true}
           clearable={true}
+          onChange={(val: number) => {
+            if (val === model.id) {
+              msg.error(t('baseDepartment.error.selfNotParent'))
+              model.parent_id = sourceModel.parent_id
+            }
+          }}
         >
         </el-tree-select>
       ),
diff --git a/web/src/modules/base/views/permission/department/data/getTableColumns.tsx b/web/src/modules/base/views/permission/department/data/getTableColumns.tsx
index d32e4e592..f72d32914 100644
--- a/web/src/modules/base/views/permission/department/data/getTableColumns.tsx
+++ b/web/src/modules/base/views/permission/department/data/getTableColumns.tsx
@@ -47,30 +47,32 @@ export default function getTableColumns(dialog: UseDialogExpose, formRef: any, t
             text: () => t('baseDepartment.page.setLeader'),
             onClick: ({ row }) => {
               dialog.setTitle(t('baseDepartment.page.setLeader'))
+              dialog.setAttr({ width: '55%' })
               dialog.open({ formType: 'setLeader', data: row })
             },
           },
-          {
-            name: 'manageUser',
-            icon: 'uil:users-alt',
-            show: () => showBtn('permission:department:update'),
-            text: () => t('baseDepartment.page.manageUser'),
-            onClick: ({ row }) => {
-              dialog.setTitle(t('baseDepartment.page.manageUser'))
-              dialog.open({ formType: 'manageUser', data: row })
-            },
-          },
           {
             name: 'managePost',
             icon: 'material-symbols:position-bottom-right-outline-rounded',
             show: () => showBtn('permission:position:index'),
             text: () => t('baseDepartment.page.managePost'),
             onClick: ({ row }) => {
-              dialog.setAttr({ width: '55%' })
               dialog.setTitle(t('baseDepartment.page.managePost'))
+              dialog.setAttr({ width: '55%' })
               dialog.open({ formType: 'position', data: row })
             },
           },
+          {
+            name: 'previewUser',
+            icon: 'uil:users-alt',
+            show: () => showBtn('permission:department:update'),
+            text: () => t('baseDepartment.page.previewUser'),
+            onClick: ({ row }) => {
+              dialog.setTitle(t('baseDepartment.page.previewUser'))
+              dialog.setAttr({ width: '55%' })
+              dialog.open({ formType: 'previewUser', data: row })
+            },
+          },
           {
             name: 'edit',
             icon: 'material-symbols:person-edit',
@@ -78,6 +80,7 @@ export default function getTableColumns(dialog: UseDialogExpose, formRef: any, t
             text: () => t('crud.edit'),
             onClick: ({ row }) => {
               dialog.setTitle(t('crud.edit'))
+              dialog.setAttr({ width: '550px' })
               dialog.open({ formType: 'edit', data: row })
             },
           },
diff --git a/web/src/modules/base/views/permission/department/form.vue b/web/src/modules/base/views/permission/department/form.vue
index 4a6bc900c..8b1e48af7 100644
--- a/web/src/modules/base/views/permission/department/form.vue
+++ b/web/src/modules/base/views/permission/department/form.vue
@@ -14,6 +14,7 @@ import getFormItems from './data/getFormItems.tsx'
 import type { MaFormExpose } from '@mineadmin/form'
 import useForm from '@/hooks/useForm.ts'
 import { ResultCode } from '@/utils/ResultCode.ts'
+import { useMessage } from '@/hooks/useMessage.ts'
 
 defineOptions({ name: 'permission:department:form' })
 
@@ -25,6 +26,7 @@ const { formType = 'add', data = null } = defineProps<{
 const t = useTrans().globalTrans
 const departmentForm = ref<MaFormExpose>()
 const deptModel = ref<DepartmentVo>({})
+const msg = useMessage()
 
 useForm('departmentForm').then((form: MaFormExpose) => {
   if (formType === 'edit' && data) {
@@ -32,7 +34,7 @@ useForm('departmentForm').then((form: MaFormExpose) => {
       deptModel.value[key] = data[key]
     })
   }
-  form.setItems(getFormItems(formType, t, deptModel.value))
+  form.setItems(getFormItems(formType, t, deptModel.value, msg))
   form.setOptions({
     labelWidth: '80px',
   })
diff --git a/web/src/modules/base/views/permission/department/index.vue b/web/src/modules/base/views/permission/department/index.vue
index 1015c3708..6e1be5a1a 100644
--- a/web/src/modules/base/views/permission/department/index.vue
+++ b/web/src/modules/base/views/permission/department/index.vue
@@ -22,6 +22,7 @@ import { ResultCode } from '@/utils/ResultCode.ts'
 
 import DepartmentForm from './form.vue'
 import Position from './position.vue'
+import SetLeader from './setLeader.vue'
 
 defineOptions({ name: 'permission:department' })
 
@@ -129,7 +130,7 @@ const schema = ref<MaProTableSchema>({
   // 搜索项
   searchItems: getSearchItems(t),
   // 表格列
-  tableColumns: getTableColumns(maDialog, formRef, t),
+  tableColumns: getTableColumns(maDialog, formRef, t, msg),
 })
 
 // 批量删除
@@ -162,6 +163,7 @@ function expandToggle() {
           type="primary"
           @click="() => {
             maDialog.setTitle(t('crud.add'))
+            maDialog.setAttr({ width: '550px' })
             maDialog.open({ formType: 'add' })
           }"
         >
@@ -193,6 +195,7 @@ function expandToggle() {
             type="primary"
             @click="() => {
               maDialog.setTitle(t('crud.add'))
+              maDialog.setAttr({ width: '550px' })
               maDialog.open({ formType: 'add' })
             }"
           >
@@ -207,7 +210,7 @@ function expandToggle() {
         <!-- 新增、编辑表单 -->
         <DepartmentForm v-if="['add', 'edit'].includes(formType)" ref="formRef" :form-type="formType" :data="data" />
         <!-- 设置部门领导 -->
-        <!--        <SetLeader v-if="formType === 'setLeader'" ref="setLeaderRef" :data="data" /> -->
+        <SetLeader v-if="formType === 'setLeader'" ref="setLeaderRef" :data="data" />
         <!-- 管理部门岗位 -->
         <Position v-if="formType === 'position'" ref="positionRef" :data="data" />
       </template>
diff --git a/web/src/modules/base/views/permission/department/setLeader.vue b/web/src/modules/base/views/permission/department/setLeader.vue
index cae37eb79..c3e330405 100644
--- a/web/src/modules/base/views/permission/department/setLeader.vue
+++ b/web/src/modules/base/views/permission/department/setLeader.vue
@@ -9,103 +9,272 @@
 -->
 
 <script setup lang="tsx">
-import type { MaFormExpose } from '@mineadmin/form'
 import type { DepartmentVo } from '~/base/api/department.ts'
-// import { getRolePermission, setRolePermission } from '~/base/api/department.ts'
-import { page } from '~/base/api/menu.ts'
-
-import useForm from '@/hooks/useForm.ts'
+import type { PositionVo } from '~/base/api/position.ts'
+import { create, deleteByIds, page, save, setDataScope } from '~/base/api/position.ts'
 
-import MaTree from '@/components/ma-tree/index.vue'
+import type { MaProTableExpose, MaProTableOptions, MaProTableSchema } from '@mineadmin/pro-table'
+import type { MaFormExpose } from '@mineadmin/form'
+import type { TransType } from '@/hooks/auto-imports/useTrans.ts'
+import type { UseDialogExpose } from '@/hooks/useDialog.ts'
+import useDialog from '@/hooks/useDialog.ts'
+import { useMessage } from '@/hooks/useMessage.ts'
+import hasAuth from '@/utils/permission/hasAuth.ts'
 import { ResultCode } from '@/utils/ResultCode.ts'
 
+import DataScope from '~/base/views/permission/component/dataScope.vue'
+import { ElTag } from 'element-plus'
+
 const { data = null } = defineProps<{
   data?: DepartmentVo | null
 }>()
 
-const t = useTrans().globalTrans
-const departmentForm = ref<MaFormExpose>()
-const userModel = ref<{ id?: number }>({})
-const checkStrictly = ref<boolean>(false)
+const dictStore = useDictStore()
+
+const i18n = useTrans() as TransType
+const t = i18n.globalTrans
+const proTableRef = ref<MaProTableExpose>()
+const scopeRef = ref()
+const positionForm = ref<MaFormExpose>()
+const postModel = ref<PositionVo>({
+  dept_id: data?.id,
+  dept_name: data?.name,
+  policy_type: '',
+})
+
+const msg = useMessage()
 
-const permissionTreeRef = ref<any>()
+function showBtn(auth: string | string[]) {
+  return hasAuth(auth)
+}
 
-useForm('departmentForm').then(async (form: MaFormExpose) => {
-  const names: string[] = []
-  if (data?.id) {
-    userModel.value.id = data.id
-    // const response: any = await getRolePermission(data?.id)
-    if (response.code === ResultCode.SUCCESS && response.data) {
-      response.data.map((item: any) => {
-        names.push(item.name)
+// 弹窗配置
+const maDialog: UseDialogExpose = useDialog({
+  lgWidth: '550px',
+  ok: ({ formType }, okLoadingState: (state: boolean) => void) => {
+    okLoadingState(true)
+    if (['add', 'edit'].includes(formType)) {
+      const elForm = positionForm.value?.getElFormRef()
+      // 验证通过后
+      elForm?.validate?.().then(() => {
+        switch (formType) {
+          // 新增
+          case 'add':
+            create(postModel.value).then((res: any) => {
+              res.code === ResultCode.SUCCESS ? msg.success(t('crud.createSuccess')) : msg.error(res.message)
+              maDialog.close()
+              proTableRef.value?.refresh()
+            }).catch((err: any) => {
+              msg.alertError(err)
+            })
+            break
+          // 修改
+          case 'edit':
+            save(postModel.value?.id as number, postModel.value).then((res: any) => {
+              res.code === 200 ? msg.success(t('crud.updateSuccess')) : msg.error(res.message)
+              maDialog.close()
+              proTableRef.value?.refresh()
+            }).catch((err: any) => {
+              msg.alertError(err)
+            })
+            break
+        }
+      }).catch()
+    }
+    else if (formType === 'setDataScope') {
+      if (postModel.value.policy_type === 'CUSTOM_FUNC') {
+        postModel.value.value = [postModel.value.func_name]
+      }
+      if (postModel.value.policy_type === 'CUSTOM_DEPT') {
+        postModel.value.value = scopeRef.value.deptRef.elTree?.getCheckedKeys()
+      }
+      setDataScope(postModel.value?.id as number, postModel.value).then((res: any) => {
+        res.code === ResultCode.SUCCESS ? msg.success(t('crud.updateSuccess')) : msg.error(res.message)
+        maDialog.close()
+        proTableRef.value?.refresh()
       })
-      checkStrictly.value = true
     }
-  }
+    okLoadingState(false)
+  },
+})
+
+// 参数配置
+const options = ref<MaProTableOptions>({
+  header: { show: false },
+  // 表格参数
+  tableOptions: {
+    adaption: false,
+    height: 400,
+    rowKey: 'id',
+  },
+  // 搜索参数
+  searchOptions: {
+    fold: true,
+    text: {
+      searchBtn: () => t('crud.search'),
+      resetBtn: () => t('crud.reset'),
+    },
+  },
+  // 搜索表单参数
+  searchFormOptions: { labelWidth: '90px' },
+  // 请求配置
+  requestOptions: {
+    // autoRequest: false,
+    requestParams: {
+      dept_id: data?.id,
+    },
+    api: page,
+  },
+})
 
-  const menuRes = await page()
-  form.setItems([
+// 架构配置
+const schema = ref<MaProTableSchema>({
+  // 搜索项
+  searchItems: [{ label: () => t('basePost.name'), prop: 'name', render: 'input' }],
+  // 表格列
+  tableColumns: [
+    // 多选列
+    { type: 'selection', showOverflowTooltip: false, label: () => t('crud.selection') },
     {
-      label: () => t('baseRoleManage.permission'),
-      prop: 'permission_id',
-      render: () => MaTree,
-      renderProps: {
-        ref: (el: any) => permissionTreeRef.value = el,
-        class: 'w-full',
-        showCheckbox: true,
-        treeKey: 'meta.title',
-        placeholder: t('form.pleaseSelect', { msg: t('baseRoleManage.permission') }),
-        nodeKey: 'name',
-        data: menuRes.data,
+      label: () => t('basePost.name'),
+      prop: 'name',
+      align: 'left',
+    },
+    {
+      label: () => t('basePost.dataScope'),
+      prop: 'policy',
+      align: 'center',
+      cellRender: ({ row }) => {
+        if (!row.policy) {
+          return '-'
+        }
+        return h(
+          ElTag,
+          { type: dictStore.t('data-scope', row.policy.policy_type, 'color') },
+          t(dictStore.t('data-scope', row.policy.policy_type, 'i18n')),
+        )
       },
-      renderSlots: {
-        default: ({ data }) => {
-          return (
-            <div class="mine-tree-node">
-              <div class="label">
-                { data.meta?.icon && <ma-svg-icon name={data.meta?.icon} size={16} />}
-                { data.meta?.i18n ? t(data.meta?.i18n) : data.meta.title ?? 'unknown' }
-              </div>
-            </div>
-          )
-        },
+    },
+    {
+      label: () => t('basePost.created_at'),
+      prop: 'created_at',
+      width: 180,
+    },
+    // 操作列
+    {
+      type: 'operation',
+      label: () => t('crud.operation'),
+      operationConfigure: {
+        actions: [
+          {
+            name: 'dataScope',
+            icon: 'mdi:sort-variant-lock-open',
+            show: () => showBtn('permission:position:data_permission'),
+            text: () => t('baseUserManage.setDataScope'),
+            onClick: ({ row }) => {
+              postModel.value.id = row.id
+              postModel.value.name = row.name
+              maDialog.setTitle(t('baseUserManage.setDataScope'))
+              maDialog.open({ formType: 'setDataScope' })
+              postModel.value.policy_type = row?.policy?.policy_type ?? undefined
+              if (postModel.value.policy_type === 'CUSTOM_FUNC') {
+                postModel.value.func_name = row.policy.value
+              }
+              if (postModel.value.policy_type === 'CUSTOM_DEPT') {
+                nextTick(() => {
+                  postModel.value.value = row.policy.value
+                  scopeRef.value.deptRef.elTree?.setCheckedKeys(row.policy.value, true)
+                })
+              }
+            },
+          },
+          {
+            name: 'edit',
+            icon: 'material-symbols:person-edit',
+            show: () => showBtn('permission:position:update'),
+            text: () => t('crud.edit'),
+            onClick: ({ row }) => {
+              Object.keys(row).map((key: string) => postModel.value[key] = row[key])
+              maDialog.setTitle(t('crud.edit'))
+              maDialog.open({ formType: 'edit', data: row })
+            },
+          },
+          {
+            name: 'del',
+            show: () => showBtn('permission:position:delete'),
+            icon: 'mdi:delete',
+            text: () => t('crud.delete'),
+            onClick: ({ row }, proxy: MaProTableExpose) => {
+              msg.delConfirm(t('crud.delDataMessage')).then(async () => {
+                const response = await deleteByIds([row.id])
+                if (response.code === ResultCode.SUCCESS) {
+                  msg.success(t('crud.delSuccess'))
+                  await proxy.refresh()
+                }
+              })
+            },
+          },
+        ],
       },
     },
-  ])
-  form.setOptions({
-    labelWidth: '80px',
-  })
-
-  await nextTick(() => {
-    permissionTreeRef.value?.setCheckStrictly(!!userModel.value?.id)
-    setTimeout(() => {
-      permissionTreeRef.value?.elTree?.setCheckedKeys?.(names)
-    }, 50)
-  })
+  ],
 })
 
-// 保存用户角色
-function saveUserRole(): Promise<any> {
-  return new Promise((resolve, reject) => {
-    const elTree = permissionTreeRef.value.elTree
-    // setRolePermission(userModel.value.id as number, elTree.getCheckedKeys() as string[]).then((res: any) => {
-      res.code === ResultCode.SUCCESS ? resolve(res) : reject(res)
-    }).catch((err) => {
-      reject(err)
-    })
-  })
-}
-
-defineExpose({
-  saveUserRole,
-  maForm: departmentForm,
+onMounted(() => {
 })
 </script>
 
 <template>
-  <ma-form ref="departmentForm" v-model="userModel" />
+  <ma-pro-table ref="proTableRef" :options="options" :schema="schema">
+    <template #actions>
+      <el-button
+        v-auth="['permission:position:save']"
+        type="primary"
+        @click="() => {
+          postModel.name = ''
+          maDialog.setTitle(t('crud.add'))
+          maDialog.open({ formType: 'add' })
+        }"
+      >
+        {{ t('crud.add') }}
+      </el-button>
+    </template>
+  </ma-pro-table>
+
+  <component :is="maDialog.Dialog">
+    <template #default="{ formType }">
+      <ma-form
+        v-if="['add', 'edit'].includes(formType)"
+        ref="positionForm"
+        v-model="postModel"
+        :options="{ labelWidth: 95 }"
+        :items="[
+          {
+            label: () => '所属部门',
+            prop: 'dept_name',
+            render: 'input',
+            renderProps: { disabled: true },
+          },
+          {
+            label: () => t('basePost.name'),
+            prop: 'name',
+            render: 'input',
+            renderProps: { placeholder: t('form.pleaseInput', { msg: t('basePost.name') }) },
+            itemProps: { rules: [{ required: true, message: t('form.requiredInput', { msg: t('basePost.placeholder.name') }) }] },
+          },
+        ]"
+      />
+      <DataScope v-if="formType === 'setDataScope'" ref="scopeRef" v-model="postModel" :label="t('basePost.belongPost')" />
+    </template>
+  </component>
 </template>
 
 <style scoped lang="scss">
-
+:deep(.mineadmin-pro-table-search) {
+  margin: 0; padding: 0;
+  @apply pt-3;
+}
+:deep(.mine-card) {
+  margin: 0;
+}
 </style>

From 8b3b4ffe3e6aebfad8173c7e8b635ccc796c5d67 Mon Sep 17 00:00:00 2001
From: "X.Mo" <root@imoi.cn>
Date: Thu, 17 Apr 2025 16:55:29 +0800
Subject: [PATCH 36/91] ma-select-table

---
 app/Model/Permission/Leader.php               |   2 +-
 web/src/components/ma-select-table/index.vue  | 111 +++++++++++++++++
 web/src/modules/base/api/leader.ts            |  37 ++++++
 ...344\275\223\344\270\255\346\226\207].yaml" |   7 ++
 .../department/data/getTableColumns.tsx       |   2 +-
 .../views/permission/department/setLeader.vue | 112 ++++++++----------
 web/types/components.d.ts                     |   1 +
 7 files changed, 208 insertions(+), 64 deletions(-)
 create mode 100644 web/src/components/ma-select-table/index.vue
 create mode 100644 web/src/modules/base/api/leader.ts

diff --git a/app/Model/Permission/Leader.php b/app/Model/Permission/Leader.php
index 1c4985e94..3061eab99 100644
--- a/app/Model/Permission/Leader.php
+++ b/app/Model/Permission/Leader.php
@@ -36,7 +36,7 @@ class Leader extends Model
     /**
      * The table associated with the model.
      */
-    protected ?string $table = 'leader';
+    protected ?string $table = 'dept_leader';
 
     /**
      * The attributes that are mass assignable.
diff --git a/web/src/components/ma-select-table/index.vue b/web/src/components/ma-select-table/index.vue
new file mode 100644
index 000000000..a090c055c
--- /dev/null
+++ b/web/src/components/ma-select-table/index.vue
@@ -0,0 +1,111 @@
+<script setup lang="ts">
+import type { MaProTableColumns, MaProTableOptions, MaSearchItem } from '@mineadmin/pro-table'
+
+defineOptions({ name: 'MaSelectTable' })
+
+const props = defineProps<{
+  api: any
+  multiple?: boolean
+  rowKey?: string
+  showKey?: string
+  columns?: MaProTableColumns[]
+  searchItems?: MaSearchItem[]
+  proTableOptions?: MaProTableOptions
+  selectProps?: Record<string, any>
+}>()
+
+const multiple = ref<boolean>(props?.multiple ?? false)
+const rowKey = ref<string>(props?.rowKey ?? 'id')
+const showKey = ref<string>(props?.showKey ?? 'id')
+const selectModel = ref<any>()
+
+const model = defineModel<any>()
+
+const options = Object.assign(
+  props?.proTableOptions ?? {}, {
+    tableOptions: {
+      adaption: false,
+      on: {
+        onRowClick: (row: any) => {
+          if (!multiple.value) {
+            row.__isSelection = !row?.__isSelection
+            if (row.__isSelection) {
+              model.value = row
+              selectModel.value = model.value[showKey.value]
+            }
+            else {
+              model.value = null
+              selectModel.value = null
+            }
+          }
+          else {
+            row.__isSelection = !row?.__isSelection
+            if (row.__isSelection) {
+              if (!model.value.find((item: any) => item[rowKey.value] === row[rowKey.value])) {
+                model.value.push(row)
+              }
+            }
+            else {
+              model.value = model.value.filter((item: any) => item[rowKey.value] !== row[rowKey.value])
+            }
+            selectModel.value = model.value.map((item: any) => item[showKey.value])
+          }
+        },
+      },
+    },
+    tools: { show: false },
+    header: { show: false },
+    requestOptions: {
+      api: props.api,
+    },
+  },
+)
+
+const cols = props?.columns ?? []
+
+onMounted(() => {
+  if (multiple.value) {
+    selectModel.value = []
+    model.value = []
+  }
+  else {
+    selectModel.value = null
+    model.value = null
+  }
+  cols.unshift({ label: '#', prop: '__selections__', width: '50' })
+})
+</script>
+
+<template>
+  <el-select
+    v-model="selectModel"
+    :max-collapse-tags="3"
+    v-bind="props?.selectProps ?? {}"
+    :collapse-tags="multiple"
+    :multiple="multiple"
+  >
+    <template #empty>
+      <ma-pro-table
+        :options="options"
+        :schema="{ tableColumns: cols, searchItems: props?.searchItems ?? [] }"
+      >
+        <template #toolbarLeft>
+          <el-alert type="success">
+            单击行选择数据
+          </el-alert>
+        </template>
+        <template #column-__selections__="{ row }">
+          <div class="flex items-center justify-center">
+            <ma-svg-icon v-if="row.__isSelection === true" name="heroicons:check-16-solid" class="text-green-7" :size="20" />
+          </div>
+        </template>
+      </ma-pro-table>
+    </template>
+  </el-select>
+</template>
+
+<style scoped>
+:deep(.mine-card) {
+  padding: 0;
+}
+</style>
diff --git a/web/src/modules/base/api/leader.ts b/web/src/modules/base/api/leader.ts
new file mode 100644
index 000000000..7e56e13d3
--- /dev/null
+++ b/web/src/modules/base/api/leader.ts
@@ -0,0 +1,37 @@
+/**
+ * MineAdmin is committed to providing solutions for quickly building web applications
+ * Please view the LICENSE file that was distributed with this source code,
+ * For the full copyright and license information.
+ * Thank you very much for using MineAdmin.
+ *
+ * @Author X.Mo<root@imoi.cn>
+ * @Link   https://github.com/mineadmin
+ */
+import type { PageList, ResponseStruct } from '#/global'
+
+export interface LeaderVo {
+  user_id?: number | null
+  dept_id?: number
+  dept_name?: string
+}
+
+export interface LeaderSearchVo {
+  user_id?: string
+  [key: string]: any
+}
+
+export function page(data: LeaderSearchVo | null = null): Promise<ResponseStruct<PageList<LeaderVo>>> {
+  return useHttp().get('/admin/leader/list', { params: data })
+}
+
+export function create(data: LeaderVo): Promise<ResponseStruct<null>> {
+  return useHttp().post('/admin/leader', data)
+}
+
+export function save(id: number, data: LeaderVo): Promise<ResponseStruct<null>> {
+  return useHttp().put(`/admin/leader/${id}`, data)
+}
+
+export function deleteByIds(ids: number[]): Promise<ResponseStruct<null>> {
+  return useHttp().delete('/admin/leader', { data: ids })
+}
diff --git "a/web/src/modules/base/locales/zh_CN[\347\256\200\344\275\223\344\270\255\346\226\207].yaml" "b/web/src/modules/base/locales/zh_CN[\347\256\200\344\275\223\344\270\255\346\226\207].yaml"
index c83432be8..873f5029d 100644
--- "a/web/src/modules/base/locales/zh_CN[\347\256\200\344\275\223\344\270\255\346\226\207].yaml"
+++ "b/web/src/modules/base/locales/zh_CN[\347\256\200\344\275\223\344\270\255\346\226\207].yaml"
@@ -158,6 +158,13 @@ basePost:
   callFunc: 调用函数名
   placeholder:
     name: 请输入岗位名称
+baseDeptLeader:
+  belongDept: 所属部门
+  username: 用户名
+  nickname: 昵称
+  user_id: 选择用户
+  placeholder:
+    user_id: 请选择要设置为负责人的用户
 baseMenu:
   permission:
     index: 权限管理
diff --git a/web/src/modules/base/views/permission/department/data/getTableColumns.tsx b/web/src/modules/base/views/permission/department/data/getTableColumns.tsx
index f72d32914..f523bc25c 100644
--- a/web/src/modules/base/views/permission/department/data/getTableColumns.tsx
+++ b/web/src/modules/base/views/permission/department/data/getTableColumns.tsx
@@ -42,7 +42,7 @@ export default function getTableColumns(dialog: UseDialogExpose, formRef: any, t
         actions: [
           {
             name: 'setLeader',
-            show: () => showBtn('permission:department:update'),
+            show: () => showBtn('permission:leader:index'),
             icon: 'material-symbols:checklist-rounded',
             text: () => t('baseDepartment.page.setLeader'),
             onClick: ({ row }) => {
diff --git a/web/src/modules/base/views/permission/department/setLeader.vue b/web/src/modules/base/views/permission/department/setLeader.vue
index c3e330405..85cb54187 100644
--- a/web/src/modules/base/views/permission/department/setLeader.vue
+++ b/web/src/modules/base/views/permission/department/setLeader.vue
@@ -10,8 +10,9 @@
 
 <script setup lang="tsx">
 import type { DepartmentVo } from '~/base/api/department.ts'
-import type { PositionVo } from '~/base/api/position.ts'
-import { create, deleteByIds, page, save, setDataScope } from '~/base/api/position.ts'
+import type { LeaderVo } from '~/base/api/leader.ts'
+import { create, deleteByIds, page, save } from '~/base/api/leader.ts'
+import { page as userPage } from '~/base/api/user.ts'
 
 import type { MaProTableExpose, MaProTableOptions, MaProTableSchema } from '@mineadmin/pro-table'
 import type { MaFormExpose } from '@mineadmin/form'
@@ -22,8 +23,8 @@ import { useMessage } from '@/hooks/useMessage.ts'
 import hasAuth from '@/utils/permission/hasAuth.ts'
 import { ResultCode } from '@/utils/ResultCode.ts'
 
-import DataScope from '~/base/views/permission/component/dataScope.vue'
 import { ElTag } from 'element-plus'
+import MaSelectTable from '@/components/ma-select-table/index.vue'
 
 const { data = null } = defineProps<{
   data?: DepartmentVo | null
@@ -34,12 +35,11 @@ const dictStore = useDictStore()
 const i18n = useTrans() as TransType
 const t = i18n.globalTrans
 const proTableRef = ref<MaProTableExpose>()
-const scopeRef = ref()
-const positionForm = ref<MaFormExpose>()
-const postModel = ref<PositionVo>({
+const leaderForm = ref<MaFormExpose>()
+const leaderModel = ref<LeaderVo>({
+  user_id: null,
   dept_id: data?.id,
   dept_name: data?.name,
-  policy_type: '',
 })
 
 const msg = useMessage()
@@ -54,13 +54,13 @@ const maDialog: UseDialogExpose = useDialog({
   ok: ({ formType }, okLoadingState: (state: boolean) => void) => {
     okLoadingState(true)
     if (['add', 'edit'].includes(formType)) {
-      const elForm = positionForm.value?.getElFormRef()
+      const elForm = leaderForm.value?.getElFormRef()
       // 验证通过后
       elForm?.validate?.().then(() => {
         switch (formType) {
           // 新增
           case 'add':
-            create(postModel.value).then((res: any) => {
+            create(leaderModel.value).then((res: any) => {
               res.code === ResultCode.SUCCESS ? msg.success(t('crud.createSuccess')) : msg.error(res.message)
               maDialog.close()
               proTableRef.value?.refresh()
@@ -70,7 +70,7 @@ const maDialog: UseDialogExpose = useDialog({
             break
           // 修改
           case 'edit':
-            save(postModel.value?.id as number, postModel.value).then((res: any) => {
+            save(leaderModel.value?.id as number, leaderModel.value).then((res: any) => {
               res.code === 200 ? msg.success(t('crud.updateSuccess')) : msg.error(res.message)
               maDialog.close()
               proTableRef.value?.refresh()
@@ -81,19 +81,6 @@ const maDialog: UseDialogExpose = useDialog({
         }
       }).catch()
     }
-    else if (formType === 'setDataScope') {
-      if (postModel.value.policy_type === 'CUSTOM_FUNC') {
-        postModel.value.value = [postModel.value.func_name]
-      }
-      if (postModel.value.policy_type === 'CUSTOM_DEPT') {
-        postModel.value.value = scopeRef.value.deptRef.elTree?.getCheckedKeys()
-      }
-      setDataScope(postModel.value?.id as number, postModel.value).then((res: any) => {
-        res.code === ResultCode.SUCCESS ? msg.success(t('crud.updateSuccess')) : msg.error(res.message)
-        maDialog.close()
-        proTableRef.value?.refresh()
-      })
-    }
     okLoadingState(false)
   },
 })
@@ -130,13 +117,29 @@ const options = ref<MaProTableOptions>({
 // 架构配置
 const schema = ref<MaProTableSchema>({
   // 搜索项
-  searchItems: [{ label: () => t('basePost.name'), prop: 'name', render: 'input' }],
+  searchItems: [{
+    label: () => t('baseDeptLeader.user_id'),
+    prop: 'users',
+    render: () => {
+      return h(MaSelectTable, {
+        api: userPage,
+        showKey: 'username',
+        multiple: true,
+        columns: [
+          { label: () => t('baseUserManage.username'), prop: 'username' },
+          { label: () => t('baseUserManage.nickname'), prop: 'nickname' },
+          { label: () => t('baseUserManage.phone'), prop: 'phone' },
+        ],
+      })
+    },
+    span: 2,
+  }],
   // 表格列
   tableColumns: [
     // 多选列
     { type: 'selection', showOverflowTooltip: false, label: () => t('crud.selection') },
     {
-      label: () => t('basePost.name'),
+      label: () => t('baseDeptLeader.user_id'),
       prop: 'name',
       align: 'left',
     },
@@ -166,42 +169,20 @@ const schema = ref<MaProTableSchema>({
       label: () => t('crud.operation'),
       operationConfigure: {
         actions: [
-          {
-            name: 'dataScope',
-            icon: 'mdi:sort-variant-lock-open',
-            show: () => showBtn('permission:position:data_permission'),
-            text: () => t('baseUserManage.setDataScope'),
-            onClick: ({ row }) => {
-              postModel.value.id = row.id
-              postModel.value.name = row.name
-              maDialog.setTitle(t('baseUserManage.setDataScope'))
-              maDialog.open({ formType: 'setDataScope' })
-              postModel.value.policy_type = row?.policy?.policy_type ?? undefined
-              if (postModel.value.policy_type === 'CUSTOM_FUNC') {
-                postModel.value.func_name = row.policy.value
-              }
-              if (postModel.value.policy_type === 'CUSTOM_DEPT') {
-                nextTick(() => {
-                  postModel.value.value = row.policy.value
-                  scopeRef.value.deptRef.elTree?.setCheckedKeys(row.policy.value, true)
-                })
-              }
-            },
-          },
           {
             name: 'edit',
             icon: 'material-symbols:person-edit',
-            show: () => showBtn('permission:position:update'),
+            show: () => showBtn('permission:leader:update'),
             text: () => t('crud.edit'),
             onClick: ({ row }) => {
-              Object.keys(row).map((key: string) => postModel.value[key] = row[key])
+              Object.keys(row).map((key: string) => leaderModel.value[key] = row[key])
               maDialog.setTitle(t('crud.edit'))
               maDialog.open({ formType: 'edit', data: row })
             },
           },
           {
             name: 'del',
-            show: () => showBtn('permission:position:delete'),
+            show: () => showBtn('permission:leader:delete'),
             icon: 'mdi:delete',
             text: () => t('crud.delete'),
             onClick: ({ row }, proxy: MaProTableExpose) => {
@@ -225,13 +206,21 @@ onMounted(() => {
 </script>
 
 <template>
-  <ma-pro-table ref="proTableRef" :options="options" :schema="schema">
+  <ma-pro-table
+    ref="proTableRef"
+    :options="options"
+    :schema="schema"
+    @search-submit="(form) => {
+      console.log(form)
+      form.user_id = form.users.map((item: any) => item.id)
+      delete form.users
+    }"
+  >
     <template #actions>
       <el-button
-        v-auth="['permission:position:save']"
+        v-auth="['permission:leader:save']"
         type="primary"
         @click="() => {
-          postModel.name = ''
           maDialog.setTitle(t('crud.add'))
           maDialog.open({ formType: 'add' })
         }"
@@ -245,26 +234,25 @@ onMounted(() => {
     <template #default="{ formType }">
       <ma-form
         v-if="['add', 'edit'].includes(formType)"
-        ref="positionForm"
-        v-model="postModel"
+        ref="leaderForm"
+        v-model="leaderModel"
         :options="{ labelWidth: 95 }"
         :items="[
           {
-            label: () => '所属部门',
+            label: () => t('baseDeptLeader.belongDept'),
             prop: 'dept_name',
             render: 'input',
             renderProps: { disabled: true },
           },
           {
-            label: () => t('basePost.name'),
-            prop: 'name',
-            render: 'input',
-            renderProps: { placeholder: t('form.pleaseInput', { msg: t('basePost.name') }) },
-            itemProps: { rules: [{ required: true, message: t('form.requiredInput', { msg: t('basePost.placeholder.name') }) }] },
+            label: () => t('baseDeptLeader.user_id'),
+            prop: 'user_id',
+            render: () => MaSelectTable,
+            renderProps: { placeholder: t('form.pleaseSelect', { msg: t('baseDeptLeader.user_id') }) },
+            itemProps: { rules: [{ required: true, message: t('form.requiredSelect', { msg: t('baseDeptLeader.placeholder.user_id') }) }] },
           },
         ]"
       />
-      <DataScope v-if="formType === 'setDataScope'" ref="scopeRef" v-model="postModel" :label="t('basePost.belongPost')" />
     </template>
   </component>
 </template>
diff --git a/web/types/components.d.ts b/web/types/components.d.ts
index 71745d58d..7bd02e8ce 100644
--- a/web/types/components.d.ts
+++ b/web/types/components.d.ts
@@ -22,6 +22,7 @@ declare module 'vue' {
     MaKeyValue: typeof import('./../src/components/ma-key-value/index.vue')['default']
     MaRemoteSelect: typeof import('./../src/components/ma-remote-select/index.vue')['default']
     MaResourcePicker: typeof import('./../src/components/ma-resource-picker/index.vue')['default']
+    MaSelectTable: typeof import('./../src/components/ma-select-table/index.vue')['default']
     MaSvgIcon: typeof import('./../src/components/ma-svg-icon/index.vue')['default']
     MaTree: typeof import('./../src/components/ma-tree/index.vue')['default']
     MaUploadFile: typeof import('./../src/components/ma-upload-file/index.vue')['default']

From a2c5f6d74fe1f7e8fcb6652c90308e46e655cfe6 Mon Sep 17 00:00:00 2001
From: "X.Mo" <root@imoi.cn>
Date: Fri, 18 Apr 2025 15:59:19 +0800
Subject: [PATCH 37/91] ma-select-table

---
 web/src/components/ma-select-table/index.vue  | 61 ++++++++++++-------
 .../views/permission/department/setLeader.vue | 16 +++--
 2 files changed, 48 insertions(+), 29 deletions(-)

diff --git a/web/src/components/ma-select-table/index.vue b/web/src/components/ma-select-table/index.vue
index a090c055c..f4e6ca33f 100644
--- a/web/src/components/ma-select-table/index.vue
+++ b/web/src/components/ma-select-table/index.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import type { MaProTableColumns, MaProTableOptions, MaSearchItem } from '@mineadmin/pro-table'
+import type { MaProTableColumns, MaProTableExpose, MaProTableOptions, MaSearchItem } from '@mineadmin/pro-table'
 
 defineOptions({ name: 'MaSelectTable' })
 
@@ -15,6 +15,8 @@ const props = defineProps<{
 }>()
 
 const multiple = ref<boolean>(props?.multiple ?? false)
+const selectTableRef = ref<MaProTableExpose>()
+const selectRef = ref()
 const rowKey = ref<string>(props?.rowKey ?? 'id')
 const showKey = ref<string>(props?.showKey ?? 'id')
 const selectModel = ref<any>()
@@ -27,28 +29,23 @@ const options = Object.assign(
       adaption: false,
       on: {
         onRowClick: (row: any) => {
-          if (!multiple.value) {
-            row.__isSelection = !row?.__isSelection
-            if (row.__isSelection) {
-              model.value = row
-              selectModel.value = model.value[showKey.value]
+          if (multiple.value) {
+            const index = model.value.findIndex((item: any) => item[rowKey.value] === row[rowKey.value])
+            if (index === -1) {
+              model.value.push(row)
             }
             else {
-              model.value = null
-              selectModel.value = null
+              model.value.splice(index, 1)
             }
           }
           else {
-            row.__isSelection = !row?.__isSelection
-            if (row.__isSelection) {
-              if (!model.value.find((item: any) => item[rowKey.value] === row[rowKey.value])) {
-                model.value.push(row)
-              }
+            if (model.value?.[rowKey.value] && row[rowKey.value] === model.value[rowKey.value]) {
+              model.value = null
             }
             else {
-              model.value = model.value.filter((item: any) => item[rowKey.value] !== row[rowKey.value])
+              model.value = row
             }
-            selectModel.value = model.value.map((item: any) => item[showKey.value])
+            selectRef.value?.blur()
           }
         },
       },
@@ -63,29 +60,46 @@ const options = Object.assign(
 
 const cols = props?.columns ?? []
 
-onMounted(() => {
-  if (multiple.value) {
-    selectModel.value = []
-    model.value = []
+watch(() => model.value, () => {
+  if (multiple.value && model.value?.length > 0) {
+    selectModel.value = model.value.map((item: any) => item[showKey.value])
   }
-  else {
-    selectModel.value = null
-    model.value = null
+  if (!multiple.value) {
+    selectModel.value = model.value?.[showKey.value] ?? null
   }
+}, { immediate: true, deep: true })
+
+onMounted(() => {
   cols.unshift({ label: '#', prop: '__selections__', width: '50' })
+  if (multiple.value && !model.value) {
+    model.value = []
+  }
 })
 </script>
 
 <template>
   <el-select
+    ref="selectRef"
     v-model="selectModel"
     :max-collapse-tags="3"
     v-bind="props?.selectProps ?? {}"
     :collapse-tags="multiple"
     :multiple="multiple"
+    clearable
+    @clear="() => {
+      if (multiple) {
+        model = []
+        selectModel = []
+      }
+      else {
+        model = null
+        selectModel = null
+      }
+    }"
   >
     <template #empty>
       <ma-pro-table
+        ref="selectTableRef"
         :options="options"
         :schema="{ tableColumns: cols, searchItems: props?.searchItems ?? [] }"
       >
@@ -96,7 +110,8 @@ onMounted(() => {
         </template>
         <template #column-__selections__="{ row }">
           <div class="flex items-center justify-center">
-            <ma-svg-icon v-if="row.__isSelection === true" name="heroicons:check-16-solid" class="text-green-7" :size="20" />
+            <ma-svg-icon v-if="multiple && model.findIndex((item: any) => item[rowKey] === row[rowKey]) !== -1" name="heroicons:check-16-solid" class="text-green-7" :size="20" />
+            <ma-svg-icon v-else-if="!multiple && model?.[rowKey] === row[rowKey]" name="heroicons:check-16-solid" class="text-green-7" :size="20" />
           </div>
         </template>
       </ma-pro-table>
diff --git a/web/src/modules/base/views/permission/department/setLeader.vue b/web/src/modules/base/views/permission/department/setLeader.vue
index 85cb54187..5dbc68937 100644
--- a/web/src/modules/base/views/permission/department/setLeader.vue
+++ b/web/src/modules/base/views/permission/department/setLeader.vue
@@ -124,12 +124,18 @@ const schema = ref<MaProTableSchema>({
       return h(MaSelectTable, {
         api: userPage,
         showKey: 'username',
-        multiple: true,
+        multiple: false,
+        selectProps: {
+          placeholder: '请选择用户',
+        },
         columns: [
           { label: () => t('baseUserManage.username'), prop: 'username' },
           { label: () => t('baseUserManage.nickname'), prop: 'nickname' },
           { label: () => t('baseUserManage.phone'), prop: 'phone' },
         ],
+        searchItems: [{
+          label: '用户名', prop: 'username', render: 'input',
+        }],
       })
     },
     span: 2,
@@ -202,6 +208,9 @@ const schema = ref<MaProTableSchema>({
 })
 
 onMounted(() => {
+  proTableRef.value?.setSearchForm({
+    // users: { username: 'admin', id: 1, nickname: '创始人', phone: '16858888988' },
+  })
 })
 </script>
 
@@ -210,11 +219,6 @@ onMounted(() => {
     ref="proTableRef"
     :options="options"
     :schema="schema"
-    @search-submit="(form) => {
-      console.log(form)
-      form.user_id = form.users.map((item: any) => item.id)
-      delete form.users
-    }"
   >
     <template #actions>
       <el-button

From 673ea5ae15e4c83ea8943d3fcc34603a3e57c661 Mon Sep 17 00:00:00 2001
From: "X.Mo" <root@imoi.cn>
Date: Mon, 21 Apr 2025 09:23:04 +0800
Subject: [PATCH 38/91] =?UTF-8?q?=E9=83=A8=E9=97=A8=E8=B4=9F=E8=B4=A3?=
 =?UTF-8?q?=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/permission/department/setLeader.vue | 27 ++++++++++++++-----
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/web/src/modules/base/views/permission/department/setLeader.vue b/web/src/modules/base/views/permission/department/setLeader.vue
index 5dbc68937..907430d3f 100644
--- a/web/src/modules/base/views/permission/department/setLeader.vue
+++ b/web/src/modules/base/views/permission/department/setLeader.vue
@@ -126,7 +126,7 @@ const schema = ref<MaProTableSchema>({
         showKey: 'username',
         multiple: false,
         selectProps: {
-          placeholder: '请选择用户',
+          placeholder: t('form.pleaseSelect', { msg: t('baseUserManage.username') }),
         },
         columns: [
           { label: () => t('baseUserManage.username'), prop: 'username' },
@@ -134,7 +134,7 @@ const schema = ref<MaProTableSchema>({
           { label: () => t('baseUserManage.phone'), prop: 'phone' },
         ],
         searchItems: [{
-          label: '用户名', prop: 'username', render: 'input',
+          label: t('baseUserManage.username'), prop: 'username', render: 'input',
         }],
       })
     },
@@ -208,9 +208,6 @@ const schema = ref<MaProTableSchema>({
 })
 
 onMounted(() => {
-  proTableRef.value?.setSearchForm({
-    // users: { username: 'admin', id: 1, nickname: '创始人', phone: '16858888988' },
-  })
 })
 </script>
 
@@ -219,6 +216,9 @@ onMounted(() => {
     ref="proTableRef"
     :options="options"
     :schema="schema"
+    @search-submit="(form) => {
+      form.user_id = form.users.id
+    }"
   >
     <template #actions>
       <el-button
@@ -252,7 +252,22 @@ onMounted(() => {
             label: () => t('baseDeptLeader.user_id'),
             prop: 'user_id',
             render: () => MaSelectTable,
-            renderProps: { placeholder: t('form.pleaseSelect', { msg: t('baseDeptLeader.user_id') }) },
+            renderProps: {
+              api: userPage,
+              showKey: 'username',
+              multiple: true,
+              selectProps: {
+                placeholder: t('form.pleaseSelect', { msg: t('baseDeptLeader.user_id') }),
+              },
+              columns: [
+                { label: () => t('baseUserManage.username'), prop: 'username' },
+                { label: () => t('baseUserManage.nickname'), prop: 'nickname' },
+                { label: () => t('baseUserManage.phone'), prop: 'phone' },
+              ],
+              searchItems: [{
+                label: t('baseUserManage.username'), prop: 'username', render: 'input',
+              }],
+            },
             itemProps: { rules: [{ required: true, message: t('form.requiredSelect', { msg: t('baseDeptLeader.placeholder.user_id') }) }] },
           },
         ]"

From 3b33606e9c13849400d957d595f1110359ad58d4 Mon Sep 17 00:00:00 2001
From: "X.Mo" <root@imoi.cn>
Date: Wed, 23 Apr 2025 09:03:24 +0800
Subject: [PATCH 39/91] up

---
 app/Http/Admin/Request/Permission/LeaderRequest.php      | 4 ++--
 app/Repository/Permission/LeaderRepository.php           | 9 +++++++++
 .../base/views/permission/department/setLeader.vue       | 4 +++-
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/app/Http/Admin/Request/Permission/LeaderRequest.php b/app/Http/Admin/Request/Permission/LeaderRequest.php
index 70b78e80a..f401c594b 100644
--- a/app/Http/Admin/Request/Permission/LeaderRequest.php
+++ b/app/Http/Admin/Request/Permission/LeaderRequest.php
@@ -36,8 +36,8 @@ public function authorize(): bool
     public function rules(): array
     {
         return [
-            'user_id' => 'required|string|exists:user,id',
-            'dept_id' => 'required|integer|exists:department,id',
+            'user_id' => 'required|array',
+            'dept_id' => 'required|integer',
         ];
     }
 
diff --git a/app/Repository/Permission/LeaderRepository.php b/app/Repository/Permission/LeaderRepository.php
index f21b81bcc..ca62593d7 100644
--- a/app/Repository/Permission/LeaderRepository.php
+++ b/app/Repository/Permission/LeaderRepository.php
@@ -25,6 +25,15 @@ public function __construct(
         protected readonly Leader $model
     ) {}
 
+    public function create(array $data): mixed
+    {
+        foreach($data['user_id'] as $id) {
+            Leader::create(['dept_id' => $data['dept_id'], 'user_id' => $id, 'created_at' => date('Y-m-d H:i:s')]);
+        }
+        return true;
+    }
+
+
     public function handleSearch(Builder $query, array $params): Builder
     {
         return $query
diff --git a/web/src/modules/base/views/permission/department/setLeader.vue b/web/src/modules/base/views/permission/department/setLeader.vue
index 907430d3f..7f2d0b54a 100644
--- a/web/src/modules/base/views/permission/department/setLeader.vue
+++ b/web/src/modules/base/views/permission/department/setLeader.vue
@@ -57,6 +57,8 @@ const maDialog: UseDialogExpose = useDialog({
       const elForm = leaderForm.value?.getElFormRef()
       // 验证通过后
       elForm?.validate?.().then(() => {
+        leaderModel.value.user_id = leaderModel.value.users.map((item: any) => item.id)
+        delete leaderModel.value.users
         switch (formType) {
           // 新增
           case 'add':
@@ -250,7 +252,7 @@ onMounted(() => {
           },
           {
             label: () => t('baseDeptLeader.user_id'),
-            prop: 'user_id',
+            prop: 'users',
             render: () => MaSelectTable,
             renderProps: {
               api: userPage,

From d3516cd610e025cb678965bbcb1e992cd3eeca90 Mon Sep 17 00:00:00 2001
From: "X.Mo" <root@imoi.cn>
Date: Wed, 23 Apr 2025 21:16:44 +0800
Subject: [PATCH 40/91] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=83=A8?=
 =?UTF-8?q?=E9=97=A8=E8=B4=9F=E8=B4=A3=E4=BA=BA=E8=AE=BE=E7=BD=AE=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98=E5=8F=8A=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E8=B0=83=E8=AF=95=E6=A8=A1=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1. 修复部门负责人设置页面显示列，移除不必要的信息展示
2. 调整部门负责人创建逻辑，避免重复数据
3. 修改配置文件中调试模式默认值为true
4. 优化用户管理页面暗黑模式背景色
---
 app/Model/Permission/Leader.php               |  2 +
 .../Permission/LeaderRepository.php           |  6 +++
 config/config.php                             |  2 +-
 .../views/permission/department/position.vue  |  2 +-
 .../views/permission/department/setLeader.vue | 37 +++----------------
 .../base/views/permission/user/index.vue      |  2 +-
 6 files changed, 17 insertions(+), 34 deletions(-)

diff --git a/app/Model/Permission/Leader.php b/app/Model/Permission/Leader.php
index 3061eab99..281c49bde 100644
--- a/app/Model/Permission/Leader.php
+++ b/app/Model/Permission/Leader.php
@@ -33,6 +33,8 @@ class Leader extends Model
 {
     use SoftDeletes;
 
+    public bool $incrementing = false;
+
     /**
      * The table associated with the model.
      */
diff --git a/app/Repository/Permission/LeaderRepository.php b/app/Repository/Permission/LeaderRepository.php
index ca62593d7..dc1bcc836 100644
--- a/app/Repository/Permission/LeaderRepository.php
+++ b/app/Repository/Permission/LeaderRepository.php
@@ -28,11 +28,17 @@ public function __construct(
     public function create(array $data): mixed
     {
         foreach($data['user_id'] as $id) {
+            Leader::query()->where('dept_id', $data['dept_id'])->where('user_id', $id)->forceDelete();
             Leader::create(['dept_id' => $data['dept_id'], 'user_id' => $id, 'created_at' => date('Y-m-d H:i:s')]);
         }
         return true;
     }
 
+    protected function enablePageOrderBy(): bool
+    {
+        return false;
+    }
+
 
     public function handleSearch(Builder $query, array $params): Builder
     {
diff --git a/config/config.php b/config/config.php
index c9ecaadc5..56e410d1c 100644
--- a/config/config.php
+++ b/config/config.php
@@ -15,7 +15,7 @@
 return [
     'app_name' => env('APP_NAME', 'MineAdmin'),
     'scan_cacheable' => ! env('APP_DEBUG', false),
-    'debug' => env('APP_DEBUG', false),
+    'debug' => env('APP_DEBUG', true),
     StdoutLoggerInterface::class => [
         'log_level' => [
             LogLevel::ALERT,
diff --git a/web/src/modules/base/views/permission/department/position.vue b/web/src/modules/base/views/permission/department/position.vue
index c3e330405..870ffcc9f 100644
--- a/web/src/modules/base/views/permission/department/position.vue
+++ b/web/src/modules/base/views/permission/department/position.vue
@@ -158,7 +158,7 @@ const schema = ref<MaProTableSchema>({
     {
       label: () => t('basePost.created_at'),
       prop: 'created_at',
-      width: 180,
+      width: 170,
     },
     // 操作列
     {
diff --git a/web/src/modules/base/views/permission/department/setLeader.vue b/web/src/modules/base/views/permission/department/setLeader.vue
index 7f2d0b54a..2e6b5b367 100644
--- a/web/src/modules/base/views/permission/department/setLeader.vue
+++ b/web/src/modules/base/views/permission/department/setLeader.vue
@@ -23,7 +23,6 @@ import { useMessage } from '@/hooks/useMessage.ts'
 import hasAuth from '@/utils/permission/hasAuth.ts'
 import { ResultCode } from '@/utils/ResultCode.ts'
 
-import { ElTag } from 'element-plus'
 import MaSelectTable from '@/components/ma-select-table/index.vue'
 
 const { data = null } = defineProps<{
@@ -147,29 +146,16 @@ const schema = ref<MaProTableSchema>({
     // 多选列
     { type: 'selection', showOverflowTooltip: false, label: () => t('crud.selection') },
     {
-      label: () => t('baseDeptLeader.user_id'),
-      prop: 'name',
-      align: 'left',
+      label: () => t('baseDeptLeader.username'),
+      prop: 'user.username',
     },
     {
-      label: () => t('basePost.dataScope'),
-      prop: 'policy',
-      align: 'center',
-      cellRender: ({ row }) => {
-        if (!row.policy) {
-          return '-'
-        }
-        return h(
-          ElTag,
-          { type: dictStore.t('data-scope', row.policy.policy_type, 'color') },
-          t(dictStore.t('data-scope', row.policy.policy_type, 'i18n')),
-        )
-      },
+      label: () => t('baseUserManage.phone'),
+      prop: 'user.phone',
     },
     {
-      label: () => t('basePost.created_at'),
-      prop: 'created_at',
-      width: 180,
+      label: () => t('baseUserManage.email'),
+      prop: 'user.email',
     },
     // 操作列
     {
@@ -177,17 +163,6 @@ const schema = ref<MaProTableSchema>({
       label: () => t('crud.operation'),
       operationConfigure: {
         actions: [
-          {
-            name: 'edit',
-            icon: 'material-symbols:person-edit',
-            show: () => showBtn('permission:leader:update'),
-            text: () => t('crud.edit'),
-            onClick: ({ row }) => {
-              Object.keys(row).map((key: string) => leaderModel.value[key] = row[key])
-              maDialog.setTitle(t('crud.edit'))
-              maDialog.open({ formType: 'edit', data: row })
-            },
-          },
           {
             name: 'del',
             show: () => showBtn('permission:leader:delete'),
diff --git a/web/src/modules/base/views/permission/user/index.vue b/web/src/modules/base/views/permission/user/index.vue
index 4276d884b..8bdb7edac 100644
--- a/web/src/modules/base/views/permission/user/index.vue
+++ b/web/src/modules/base/views/permission/user/index.vue
@@ -158,7 +158,7 @@ function requestUserByDept(node: any) {
 
 <template>
   <div class="mine-layout flex justify-between pb-0 pl-3 pt-3">
-    <div class="w-full rounded bg-[#fff] p-2 md:w-2/12">
+    <div class="w-full rounded bg-[#fff] p-2 md:w-2/12 dark-bg-dark-8">
       <ma-tree
         :data="deptData"
         tree-key="name"

From 27d6685694f7a9ae70af5d322cb35277aa409598 Mon Sep 17 00:00:00 2001
From: "X.Mo" <root@imoi.cn>
Date: Thu, 24 Apr 2025 11:14:23 +0800
Subject: [PATCH 41/91] =?UTF-8?q?feat:=20=E9=87=8D=E6=9E=84=E9=83=A8?=
 =?UTF-8?q?=E9=97=A8=E9=A2=86=E5=AF=BC=E5=88=A0=E9=99=A4=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=EF=BC=8C=E6=94=AF=E6=8C=81=E6=8C=89=E9=83=A8=E9=97=A8ID?=
 =?UTF-8?q?=E5=92=8C=E7=94=A8=E6=88=B7ID=E6=89=B9=E9=87=8F=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Permission/LeaderController.php           | 22 +------
 .../Permission/LeaderRepository.php           |  5 ++
 app/Service/Permission/LeaderService.php      | 15 ++++-
 web/src/modules/base/api/leader.ts            |  4 +-
 .../views/permission/department/setLeader.vue | 63 +++++++++++++------
 5 files changed, 66 insertions(+), 43 deletions(-)

diff --git a/app/Http/Admin/Controller/Permission/LeaderController.php b/app/Http/Admin/Controller/Permission/LeaderController.php
index e36928565..c1416eabe 100644
--- a/app/Http/Admin/Controller/Permission/LeaderController.php
+++ b/app/Http/Admin/Controller/Permission/LeaderController.php
@@ -84,26 +84,6 @@ public function create(LeaderRequest $request): Result
         return $this->success();
     }
 
-    #[Put(
-        path: '/admin/leader/{id}',
-        operationId: 'leaderSave',
-        summary: '编辑部门领导',
-        security: [['Bearer' => [], 'ApiKey' => []]],
-        tags: ['部门领导管理'],
-    )]
-    #[RequestBody(
-        content: new JsonContent(ref: LeaderRequest::class)
-    )]
-    #[Permission(code: 'permission:leader:update')]
-    #[ResultResponse(instance: new Result())]
-    public function save(int $id, LeaderRequest $request): Result
-    {
-        $this->service->updateById($id, array_merge($request->validated(), [
-            'updated_by' => $this->currentUser->id(),
-        ]));
-        return $this->success();
-    }
-
     #[Delete(
         path: '/admin/leader',
         operationId: 'leaderDelete',
@@ -115,7 +95,7 @@ public function save(int $id, LeaderRequest $request): Result
     #[Permission(code: 'permission:leader:delete')]
     public function delete(): Result
     {
-        $this->service->deleteById($this->getRequestData());
+        $this->service->deleteByDoubleKey($this->getRequestData());
         return $this->success();
     }
 }
diff --git a/app/Repository/Permission/LeaderRepository.php b/app/Repository/Permission/LeaderRepository.php
index dc1bcc836..f5511f893 100644
--- a/app/Repository/Permission/LeaderRepository.php
+++ b/app/Repository/Permission/LeaderRepository.php
@@ -39,6 +39,11 @@ protected function enablePageOrderBy(): bool
         return false;
     }
 
+    public function deleteByDoubleKey(int $dept_id, array $user_ids): void
+    {
+        Leader::query()->where('dept_id', $dept_id)->whereIn('user_id', $user_ids)->forceDelete();
+    }
+
 
     public function handleSearch(Builder $query, array $params): Builder
     {
diff --git a/app/Service/Permission/LeaderService.php b/app/Service/Permission/LeaderService.php
index 65dbe1392..c9f6881ec 100644
--- a/app/Service/Permission/LeaderService.php
+++ b/app/Service/Permission/LeaderService.php
@@ -12,16 +12,27 @@
 
 namespace App\Service\Permission;
 
-use App\Model\Permission\Position;
+use App\Model\Permission\Leader;
 use App\Repository\Permission\LeaderRepository;
 use App\Service\IService;
+use Mockery\Exception;
 
 /**
- * @extends IService<Position>
+ * @extends IService<Leader>
  */
 class LeaderService extends IService
 {
     public function __construct(
         protected readonly LeaderRepository $repository
     ) {}
+
+    public function deleteByDoubleKey(array $data): bool
+    {
+        try {
+            $this->repository->deleteByDoubleKey($data['dept_id'], $data['user_ids']);
+            return true;
+        } catch (Exception $e) {
+            return false;
+        }
+    }
 }
diff --git a/web/src/modules/base/api/leader.ts b/web/src/modules/base/api/leader.ts
index 7e56e13d3..18ea8d569 100644
--- a/web/src/modules/base/api/leader.ts
+++ b/web/src/modules/base/api/leader.ts
@@ -32,6 +32,6 @@ export function save(id: number, data: LeaderVo): Promise<ResponseStruct<null>>
   return useHttp().put(`/admin/leader/${id}`, data)
 }
 
-export function deleteByIds(ids: number[]): Promise<ResponseStruct<null>> {
-  return useHttp().delete('/admin/leader', { data: ids })
+export function deleteByDoubleKey(dept_id: number, user_ids: number[]): Promise<ResponseStruct<null>> {
+  return useHttp().delete('/admin/leader', { data: { dept_id, user_ids } })
 }
diff --git a/web/src/modules/base/views/permission/department/setLeader.vue b/web/src/modules/base/views/permission/department/setLeader.vue
index 2e6b5b367..dfcfbcd6c 100644
--- a/web/src/modules/base/views/permission/department/setLeader.vue
+++ b/web/src/modules/base/views/permission/department/setLeader.vue
@@ -11,7 +11,7 @@
 <script setup lang="tsx">
 import type { DepartmentVo } from '~/base/api/department.ts'
 import type { LeaderVo } from '~/base/api/leader.ts'
-import { create, deleteByIds, page, save } from '~/base/api/leader.ts'
+import { create, deleteByDoubleKey, page, save } from '~/base/api/leader.ts'
 import { page as userPage } from '~/base/api/user.ts'
 
 import type { MaProTableExpose, MaProTableOptions, MaProTableSchema } from '@mineadmin/pro-table'
@@ -29,10 +29,9 @@ const { data = null } = defineProps<{
   data?: DepartmentVo | null
 }>()
 
-const dictStore = useDictStore()
-
 const i18n = useTrans() as TransType
 const t = i18n.globalTrans
+const selections = ref<any[]>([])
 const proTableRef = ref<MaProTableExpose>()
 const leaderForm = ref<MaFormExpose>()
 const leaderModel = ref<LeaderVo>({
@@ -94,6 +93,10 @@ const options = ref<MaProTableOptions>({
     adaption: false,
     height: 400,
     rowKey: 'id',
+    on: {
+      // 表格选择事件
+      onSelectionChange: (selection: any[]) => selections.value = selection,
+    },
   },
   // 搜索参数
   searchOptions: {
@@ -170,7 +173,7 @@ const schema = ref<MaProTableSchema>({
             text: () => t('crud.delete'),
             onClick: ({ row }, proxy: MaProTableExpose) => {
               msg.delConfirm(t('crud.delDataMessage')).then(async () => {
-                const response = await deleteByIds([row.id])
+                const response = await deleteByDoubleKey(row.dept_id, [row.user_id])
                 if (response.code === ResultCode.SUCCESS) {
                   msg.success(t('crud.delSuccess'))
                   await proxy.refresh()
@@ -184,8 +187,18 @@ const schema = ref<MaProTableSchema>({
   ],
 })
 
-onMounted(() => {
-})
+// 批量删除
+function handleDelete() {
+  const deptId = selections.value[0].dept_id
+  const userIds = selections.value.map((item: any) => item.user_id)
+  msg.confirm(t('crud.delMessage')).then(async () => {
+    const response = await deleteByDoubleKey(deptId, userIds)
+    if (response.code === ResultCode.SUCCESS) {
+      msg.success(t('crud.delSuccess'))
+      await proTableRef?.value?.refresh?.()
+    }
+  })
+}
 </script>
 
 <template>
@@ -193,21 +206,35 @@ onMounted(() => {
     ref="proTableRef"
     :options="options"
     :schema="schema"
-    @search-submit="(form) => {
+    @search-submit="(form: any) => {
       form.user_id = form.users.id
     }"
+    @search-reset="(form: any) => {
+      form.user_id = undefined
+    }"
   >
-    <template #actions>
-      <el-button
-        v-auth="['permission:leader:save']"
-        type="primary"
-        @click="() => {
-          maDialog.setTitle(t('crud.add'))
-          maDialog.open({ formType: 'add' })
-        }"
-      >
-        {{ t('crud.add') }}
-      </el-button>
+    <template #toolbarLeft>
+      <div>
+        <el-button
+          v-auth="['permission:leader:save']"
+          type="primary"
+          @click="() => {
+            maDialog.setTitle(t('crud.add'))
+            maDialog.open({ formType: 'add' })
+          }"
+        >
+          {{ t('crud.add') }}
+        </el-button>
+        <el-button
+          v-auth="['permission:leader:delete']"
+          type="danger"
+          plain
+          :disabled="selections.length < 1"
+          @click="handleDelete"
+        >
+          {{ t('crud.delete') }}
+        </el-button>
+      </div>
     </template>
   </ma-pro-table>
 

From b586c692dabf3c3c4cd57dd773137a83b6a6b554 Mon Sep 17 00:00:00 2001
From: "X.Mo" <root@imoi.cn>
Date: Thu, 24 Apr 2025 11:16:27 +0800
Subject: [PATCH 42/91] =?UTF-8?q?feat:=20=E7=A7=BB=E9=99=A4=E6=9C=AA?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8=E7=9A=84=E4=B8=8B=E8=BD=BD=E5=B7=A5=E5=85=B7?=
 =?UTF-8?q?=E5=87=BD=E6=95=B0=20downloadFile?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/src/utils/download.ts | 71 ---------------------------------------
 1 file changed, 71 deletions(-)
 delete mode 100644 web/src/utils/download.ts

diff --git a/web/src/utils/download.ts b/web/src/utils/download.ts
deleted file mode 100644
index d448d17cd..000000000
--- a/web/src/utils/download.ts
+++ /dev/null
@@ -1,71 +0,0 @@
-import request from '@/utils/http'
-import type { AxiosResponse } from 'axios'
-
-interface DownloadOptions {
-  url: string
-  method?: 'GET' | 'POST'
-  data?: any
-  fileName?: string
-  mimeType?: string
-  onProgress?: (progress: number) => void
-}
-
-declare global {
-  interface Navigator {
-    msSaveOrOpenBlob?: (blob: Blob, defaultName?: string) => boolean
-  }
-}
-
-interface DownloadResponse extends AxiosResponse {
-  fileName?: string
-}
-
-/**
- * 文件下载工具函数
- * @param options 下载配置项
- */
-export async function downloadFile(options: DownloadOptions) {
-  const {
-    url,
-    method = 'GET',
-    data,
-    fileName,
-    mimeType,
-    onProgress,
-  } = options
-
-  const response = await request.http({
-    url,
-    method,
-    data,
-    responseType: 'blob',
-    onDownloadProgress: (progressEvent) => {
-      if (onProgress && progressEvent.total) {
-        const progress = Math.round((progressEvent.loaded * 100) / progressEvent.total)
-        onProgress(progress)
-      }
-    },
-  }) as DownloadResponse
-
-  const downloadFileName = fileName || response.fileName || '未命名文件'
-
-  // 创建 Blob
-  const blob = new Blob([response.data], {
-    type: mimeType || response.headers['content-type'],
-  })
-
-  if (window.navigator && window.navigator.msSaveOrOpenBlob) {
-    window.navigator.msSaveOrOpenBlob(blob, downloadFileName)
-    return
-  }
-
-  const downloadUrl = window.URL.createObjectURL(blob)
-  const link = document.createElement('a')
-  link.href = downloadUrl
-  link.download = downloadFileName
-  link.style.display = 'none'
-  document.body.appendChild(link)
-  link.click()
-  document.body.removeChild(link)
-  window.URL.revokeObjectURL(downloadUrl)
-}

From d358b0c33325f65420a8316f0adb59a39444ddc8 Mon Sep 17 00:00:00 2001
From: "X.Mo" <root@imoi.cn>
Date: Thu, 24 Apr 2025 11:44:38 +0800
Subject: [PATCH 43/91] =?UTF-8?q?feat:=20=E9=83=A8=E9=97=A8=E6=9F=A5?=
 =?UTF-8?q?=E7=9C=8B=E7=94=A8=E6=88=B7=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../department/data/getTableColumns.tsx       |  4 +-
 .../views/permission/department/index.vue     |  5 +-
 .../views/permission/department/viewUser.vue  | 66 +++++++++++++++++++
 3 files changed, 72 insertions(+), 3 deletions(-)
 create mode 100644 web/src/modules/base/views/permission/department/viewUser.vue

diff --git a/web/src/modules/base/views/permission/department/data/getTableColumns.tsx b/web/src/modules/base/views/permission/department/data/getTableColumns.tsx
index f523bc25c..0e6f64bc7 100644
--- a/web/src/modules/base/views/permission/department/data/getTableColumns.tsx
+++ b/web/src/modules/base/views/permission/department/data/getTableColumns.tsx
@@ -63,14 +63,14 @@ export default function getTableColumns(dialog: UseDialogExpose, formRef: any, t
             },
           },
           {
-            name: 'previewUser',
+            name: 'viewUser',
             icon: 'uil:users-alt',
             show: () => showBtn('permission:department:update'),
             text: () => t('baseDepartment.page.previewUser'),
             onClick: ({ row }) => {
               dialog.setTitle(t('baseDepartment.page.previewUser'))
               dialog.setAttr({ width: '55%' })
-              dialog.open({ formType: 'previewUser', data: row })
+              dialog.open({ formType: 'viewUser', data: row })
             },
           },
           {
diff --git a/web/src/modules/base/views/permission/department/index.vue b/web/src/modules/base/views/permission/department/index.vue
index 6e1be5a1a..856920ee1 100644
--- a/web/src/modules/base/views/permission/department/index.vue
+++ b/web/src/modules/base/views/permission/department/index.vue
@@ -23,6 +23,7 @@ import { ResultCode } from '@/utils/ResultCode.ts'
 import DepartmentForm from './form.vue'
 import Position from './position.vue'
 import SetLeader from './setLeader.vue'
+import ViewUser from './viewUser.vue'
 
 defineOptions({ name: 'permission:department' })
 
@@ -72,7 +73,7 @@ const maDialog: UseDialogExpose = useDialog({
         }
       }).catch()
     }
-    else if (formType === 'position') {
+    else if (formType === 'position' || formType === 'viewUser') {
       maDialog.close()
     }
     else {
@@ -213,6 +214,8 @@ function expandToggle() {
         <SetLeader v-if="formType === 'setLeader'" ref="setLeaderRef" :data="data" />
         <!-- 管理部门岗位 -->
         <Position v-if="formType === 'position'" ref="positionRef" :data="data" />
+        <!-- 查看用户 -->
+        <ViewUser v-if="formType === 'viewUser'" :data="data" />
       </template>
     </component>
   </div>
diff --git a/web/src/modules/base/views/permission/department/viewUser.vue b/web/src/modules/base/views/permission/department/viewUser.vue
new file mode 100644
index 000000000..83fa07620
--- /dev/null
+++ b/web/src/modules/base/views/permission/department/viewUser.vue
@@ -0,0 +1,66 @@
+<!--
+ - MineAdmin is committed to providing solutions for quickly building web applications
+ - Please view the LICENSE file that was distributed with this source code,
+ - For the full copyright and license information.
+ - Thank you very much for using MineAdmin.
+ -
+ - @Author X.Mo<root@imoi.cn>
+ - @Link https://github.com/mineadmin
+-->
+
+<script setup lang="tsx">
+import type { DepartmentVo } from '~/base/api/department.ts'
+import type { MaTableColumns, MaTableOptions } from '@mineadmin/table'
+import type { TransType } from '@/hooks/auto-imports/useTrans.ts'
+
+const { data = null } = defineProps<{
+  data?: DepartmentVo | null
+}>()
+
+const dictStore = useDictStore()
+const i18n = useTrans() as TransType
+const t = i18n.globalTrans
+
+// 参数配置
+const options = ref<MaTableOptions>({
+  data: data?.department_users ?? [],
+  adaption: false,
+  height: 400,
+  rowKey: 'id',
+})
+
+// 架构配置
+const tableColumns = ref<MaTableColumns[]>([
+  {
+    label: () => t('baseUserManage.username'),
+    prop: 'username',
+    align: 'left',
+  },
+  {
+    label: () => t('baseUserManage.nickname'),
+    prop: 'nickname',
+  },
+  {
+    label: () => t('baseUserManage.phone'),
+    prop: 'phone',
+  },
+  {
+    label: () => t('baseUserManage.email'),
+    prop: 'email',
+  },
+])
+</script>
+
+<template>
+  <ma-table :options="options" :columns="tableColumns" />
+</template>
+
+<style scoped lang="scss">
+:deep(.mineadmin-pro-table-search) {
+  margin: 0; padding: 0;
+  @apply pt-3;
+}
+:deep(.mine-card) {
+  margin: 0;
+}
+</style>

From 3b789752dd53a87aeea70cb2498701a41cb51939 Mon Sep 17 00:00:00 2001
From: "X.Mo" <root@imoi.cn>
Date: Fri, 25 Apr 2025 17:22:38 +0800
Subject: [PATCH 44/91] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E6=9D=83=E9=99=90=E7=AD=96=E7=95=A5=E9=AA=8C=E8=AF=81?=
 =?UTF-8?q?=E7=BB=93=E6=9E=84=E5=B9=B6=E7=A7=BB=E9=99=A4=E5=86=97=E4=BD=99?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95=E6=9D=83=E9=99=90=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Admin/Request/Permission/UserRequest.php  |  6 +-
 databases/seeders/user_dept_20250310.php      |  2 -
 web/src/modules/base/api/user.ts              |  2 +-
 .../views/permission/component/dataScope.vue  |  4 +-
 .../permission/user/data/getFormItems.tsx     | 60 ++++++++++++++++---
 .../permission/user/data/getTableColumns.tsx  | 10 ----
 .../base/views/permission/user/form.vue       | 31 ++++++++--
 7 files changed, 83 insertions(+), 32 deletions(-)

diff --git a/app/Http/Admin/Request/Permission/UserRequest.php b/app/Http/Admin/Request/Permission/UserRequest.php
index 5667f78a2..0a91dc563 100644
--- a/app/Http/Admin/Request/Permission/UserRequest.php
+++ b/app/Http/Admin/Request/Permission/UserRequest.php
@@ -66,18 +66,18 @@ public function rules(): array
             'backend_setting' => 'sometimes|array|max:255',
             'remark' => 'sometimes|string|max:255',
             'policy' => 'sometimes|array',
-            'policy.*.policy_type' => [
+            'policy.policy_type' => [
                 'required_with:policy',
                 'string',
                 'max:10',
                 Rule::enum(PolicyType::class),
             ],
-            'policy.*.value' => [
+            'policy.value' => [
                 'sometimes',
                 'array',
                 'min:1',
             ],
-            'policy.*.is_default' => [
+            'policy.is_default' => [
                 'sometimes',
                 'integer',
                 'in:0,1',
diff --git a/databases/seeders/user_dept_20250310.php b/databases/seeders/user_dept_20250310.php
index d2c63c901..1a24a848e 100644
--- a/databases/seeders/user_dept_20250310.php
+++ b/databases/seeders/user_dept_20250310.php
@@ -52,7 +52,6 @@ public function run()
             'permission:position:data_permission' =>  '设置岗位数据权限',
             'permission:leader:index'  => '部门领导列表',
             'permission:leader:save'   =>  '新增部门领导',
-            'permission:leader:update' =>  '更新部门领导',
             'permission:leader:delete' =>  '部门领导移除',
         ];
         $i18n = [
@@ -67,7 +66,6 @@ public function run()
             'baseMenu.permission.positionDataScope',
             'baseMenu.permission.leaderList',
             'baseMenu.permission.leaderCreate',
-            'baseMenu.permission.leaderSave',
             'baseMenu.permission.leaderDelete',
         ];
         $i = 0;
diff --git a/web/src/modules/base/api/user.ts b/web/src/modules/base/api/user.ts
index 23a602dbc..2b609412c 100644
--- a/web/src/modules/base/api/user.ts
+++ b/web/src/modules/base/api/user.ts
@@ -25,7 +25,7 @@ export interface UserVo {
   backend_setting?: Record<string, any>
   remark?: string
   password?: string
-  policy?: any[]
+  policy?: any
   department?: any[]
   position?: any[]
 }
diff --git a/web/src/modules/base/views/permission/component/dataScope.vue b/web/src/modules/base/views/permission/component/dataScope.vue
index 60882e41a..0965f58ea 100644
--- a/web/src/modules/base/views/permission/component/dataScope.vue
+++ b/web/src/modules/base/views/permission/component/dataScope.vue
@@ -38,7 +38,7 @@ const items = ref<MaFormItem[]>([
   {
     label: () => t('basePost.selectDept'),
     prop: 'value',
-    show: (item, model) => model.policy_type === 'CUSTOM_DEPT',
+    show: () => model.value?.policy_type === 'CUSTOM_DEPT',
     render: () => MaTree,
     renderProps: {
       ref: (el: any) => deptRef.value = el,
@@ -53,7 +53,7 @@ const items = ref<MaFormItem[]>([
   {
     label: () => t('basePost.callFunc'),
     prop: 'func_name',
-    show: (item, model) => model.policy_type === 'CUSTOM_FUNC',
+    show: () => model.value?.policy_type === 'CUSTOM_FUNC',
     render: 'input',
     renderProps: {
       placeholder: t('form.pleaseInput', { msg: t('basePost.callFunc') }),
diff --git a/web/src/modules/base/views/permission/user/data/getFormItems.tsx b/web/src/modules/base/views/permission/user/data/getFormItems.tsx
index c85a3cdd0..c544f8f42 100644
--- a/web/src/modules/base/views/permission/user/data/getFormItems.tsx
+++ b/web/src/modules/base/views/permission/user/data/getFormItems.tsx
@@ -11,16 +11,32 @@ import type { MaFormItem } from '@mineadmin/form'
 import type { UserVo } from '~/base/api/user.ts'
 import MaUploadImage from '@/components/ma-upload-image/index.vue'
 import MaDictRadio from '@/components/ma-dict-picker/ma-dict-radio.vue'
+import type { UseDialogExpose } from '@/hooks/useDialog.ts'
 
-export default function getFormItems(formType: 'add' | 'edit' = 'add', t: any, model: UserVo, deptData: Ref<any[]>): MaFormItem[] {
+export default function getFormItems(formType: 'add' | 'edit' = 'add', t: any, model: UserVo, deptData: any, dialog: UseDialogExpose): MaFormItem[] {
   if (formType === 'add') {
     model.password = '123456'
     model.status = 1
     model.user_type = 100
-    model.policy = []
+    model.policy = {
+      policy_type: null,
+      value: null,
+    }
+    model.department = []
+    model.position = []
   }
 
+  if (formType === 'edit') {
+    if (!model.policy) {
+      model.policy = {}
+    }
+  }
+
+  console.log(model)
+
   const departmentList = deptData.value.filter((_, index) => index > 0)
+  const deptIds = ref<number[]>([])
+  const postList = ref<any[]>([])
 
   model.backend_setting = []
 
@@ -78,7 +94,7 @@ export default function getFormItems(formType: 'add' | 'edit' = 'add', t: any, m
     },
     {
       label: () => t('baseUserManage.dept'),
-      prop: 'department.id',
+      prop: 'department',
       render: () => <el-tree-select />,
       renderProps: {
         data: departmentList,
@@ -89,34 +105,60 @@ export default function getFormItems(formType: 'add' | 'edit' = 'add', t: any, m
         checkStrictly: true,
         nodeKey: 'id',
         placeholder: t('form.pleaseInput', { msg: t('baseUserManage.dept') }),
-        onChange: (value: any) => {
-          console.log(value)
+        onNodeClick: (row: any) => {
+          if (deptIds.value.includes(row.id)) {
+            // 移除
+            deptIds.value = deptIds.value.filter((id: number) => id !== row.id)
+            postList.value = postList.value.filter((item: any) => item.id !== row.id)
+          }
+          else {
+            // 添加
+            deptIds.value.push(row.id)
+            const post = JSON.parse(JSON.stringify(row))
+            post.disabled = true
+            postList.value.push(post)
+          }
         },
       },
     },
     {
       label: () => t('baseUserManage.post'),
-      prop: 'position.id',
+      prop: 'position',
       render: () => <el-tree-select />,
       cols: { md: 12, xs: 24 },
       renderProps: {
-        data: departmentList,
+        data: postList,
+        defaultExpandAll: true,
         multiple: true,
         filterable: true,
         clearable: true,
-        props: { label: 'name' },
+        props: { label: 'name', children: 'positions' },
         checkStrictly: true,
         nodeKey: 'id',
         placeholder: t('form.pleaseInput', { msg: t('baseUserManage.dept') }),
       },
     },
     {
-      label: () => t('baseUserManage.dataScope'),
       render: () => <el-button />,
       cols: { md: 12, xs: 24 },
       renderProps: {
         type: 'primary',
         plain: true,
+        onClick: () => {
+          dialog.setTitle(t('baseUserManage.setDataScope'))
+          model.policy!.name = model.username
+          dialog.open()
+        },
+      },
+      itemSlots: {
+        label: () => (
+          <div class="flex items-center gap-x-1">
+            {t('baseUserManage.dataScope')}
+            <el-tooltip content="设置后将覆盖岗位的数据权限" placement="top">
+              <ma-svg-icon name="material-symbols:help-outline" />
+            </el-tooltip>
+          </div>
+        ),
       },
       renderSlots: {
         default: () => t('baseUserManage.setDataScope'),
diff --git a/web/src/modules/base/views/permission/user/data/getTableColumns.tsx b/web/src/modules/base/views/permission/user/data/getTableColumns.tsx
index 202156412..2a3ab5b6d 100644
--- a/web/src/modules/base/views/permission/user/data/getTableColumns.tsx
+++ b/web/src/modules/base/views/permission/user/data/getTableColumns.tsx
@@ -101,16 +101,6 @@ export default function getTableColumns(dialog: UseDialogExpose, formRef: any, t
               dialog.open({ formType: 'setRole', data: row })
             },
           },
-          {
-            name: 'setDataScope',
-            show: ({ row }) => showBtn(['permission:user:update', 'permission:user:update'], row),
-            icon: 'mingcute:telescope-2-fill',
-            text: () => t('baseUserManage.setDataScope'),
-            onClick: ({ row }) => {
-              dialog.setTitle(t('baseUserManage.setDataScope'))
-              dialog.open({ formType: 'setDataScope', data: row })
-            },
-          },
           {
             name: 'initPassword',
             show: ({ row }) => showBtn('permission:user:password', row),
diff --git a/web/src/modules/base/views/permission/user/form.vue b/web/src/modules/base/views/permission/user/form.vue
index efde815b0..d05bd1413 100644
--- a/web/src/modules/base/views/permission/user/form.vue
+++ b/web/src/modules/base/views/permission/user/form.vue
@@ -14,9 +14,11 @@ import getFormItems from './data/getFormItems.tsx'
 import type { MaFormExpose } from '@mineadmin/form'
 import useForm from '@/hooks/useForm.ts'
 import { ResultCode } from '@/utils/ResultCode.ts'
+import type { UseDialogExpose } from '@/hooks/useDialog.ts'
+import useDialog from '@/hooks/useDialog.ts'
+import DataScope from '../component/dataScope.vue'
 
 defineOptions({ name: 'permission:user:form' })
-
 const { formType = 'add', data = null } = defineProps<{
   formType?: 'add' | 'edit'
   data?: UserVo | null
@@ -25,17 +27,32 @@ const { formType = 'add', data = null } = defineProps<{
 const t = useTrans().globalTrans
 const userForm = ref<MaFormExpose>()
 const userModel = ref<UserVo>({})
+const scopeRef = ref()
 const deptData = inject('deptData')
 
+// 弹窗配置
+const maDialog: UseDialogExpose = useDialog({
+  lgWidth: '750px',
+  ok: () => {
+    if (userModel.value.policy.policy_type === 'CUSTOM_FUNC') {
+      userModel.value.policy.value = [userModel.value.policy.func_name]
+    }
+    if (userModel.value.policy.policy_type === 'CUSTOM_DEPT') {
+      userModel.value.policy.value = scopeRef.value.deptRef.elTree?.getCheckedKeys()
+    }
+    maDialog.close()
+  },
+})
+
 useForm('userForm').then((form: MaFormExpose) => {
   if (formType === 'edit' && data) {
     Object.keys(data).map((key: string) => {
       userModel.value[key] = data[key]
     })
   }
-  form.setItems(getFormItems(formType, t, userModel.value, deptData))
+  form.setItems(getFormItems(formType, t, userModel.value, deptData, maDialog))
   form.setOptions({
-    labelWidth: '80px',
+    labelWidth: '90px',
   })
 })
 
@@ -69,8 +86,12 @@ defineExpose({
 </script>
 
 <template>
-  {{ userModel }}
-  <ma-form ref="userForm" v-model="userModel" />
+  <div>
+    <ma-form ref="userForm" v-model="userModel" />
+    <component :is="maDialog.Dialog">
+      <DataScope ref="scopeRef" v-model="userModel.policy" :label="t('baseUserManage.username')" />
+    </component>
+  </div>
 </template>
 
 <style scoped lang="scss">

From fc683a2e9ad722ca44824c163caf67016934b558 Mon Sep 17 00:00:00 2001
From: "X.Mo" <root@imoi.cn>
Date: Fri, 25 Apr 2025 20:34:52 +0800
Subject: [PATCH 45/91] =?UTF-8?q?feat:=20=E9=83=A8=E9=97=A8=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E5=88=86=E6=94=AF=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../permission/user/data/getFormItems.tsx     | 71 +++++++++++++++----
 .../base/views/permission/user/form.vue       |  2 +-
 2 files changed, 57 insertions(+), 16 deletions(-)

diff --git a/web/src/modules/base/views/permission/user/data/getFormItems.tsx b/web/src/modules/base/views/permission/user/data/getFormItems.tsx
index c544f8f42..8f30fbef8 100644
--- a/web/src/modules/base/views/permission/user/data/getFormItems.tsx
+++ b/web/src/modules/base/views/permission/user/data/getFormItems.tsx
@@ -13,33 +13,57 @@ import MaUploadImage from '@/components/ma-upload-image/index.vue'
 import MaDictRadio from '@/components/ma-dict-picker/ma-dict-radio.vue'
 import type { UseDialogExpose } from '@/hooks/useDialog.ts'
 
-export default function getFormItems(formType: 'add' | 'edit' = 'add', t: any, model: UserVo, deptData: any, dialog: UseDialogExpose): MaFormItem[] {
+export default function getFormItems(
+  formType: 'add' | 'edit' = 'add',
+  t: any,
+  model: UserVo,
+  deptData: any,
+  dialog: UseDialogExpose,
+  scopeRef: any,
+): MaFormItem[] {
   if (formType === 'add') {
     model.password = '123456'
     model.status = 1
     model.user_type = 100
-    model.policy = {
-      policy_type: null,
-      value: null,
-    }
     model.department = []
     model.position = []
   }
 
-  if (formType === 'edit') {
-    if (!model.policy) {
-      model.policy = {}
-    }
-  }
-
-  console.log(model)
-
   const departmentList = deptData.value.filter((_, index) => index > 0)
   const deptIds = ref<number[]>([])
   const postList = ref<any[]>([])
 
   model.backend_setting = []
 
+  if (formType === 'edit') {
+    const findNode = (nodes: any[], id: number) => {
+      for (let i = 0; i < nodes.length; i++) {
+        if (nodes[i].id === id) {
+          return nodes[i]
+        }
+        if (nodes[i].children) {
+          const node = findNode(nodes[i].children, id)
+          if (node) {
+            return node
+          }
+        }
+      }
+      return null
+    }
+
+    model.department = model.department?.map((item: any) => {
+      // 添加
+      deptIds.value.push(item.id)
+      const post = JSON.parse(JSON.stringify(findNode(departmentList, item.id) ?? null))
+      if (post) {
+        post.disabled = true
+        postList.value.push(post)
+      }
+      return item.id
+    })
+    model.position = model.position?.map((item: any) => item.id)
+  }
+
   return [
     {
       label: () => t('baseUserManage.avatar'),
@@ -144,10 +168,27 @@ export default function getFormItems(formType: 'add' | 'edit' = 'add', t: any, m
       renderProps: {
         type: 'primary',
         plain: true,
-        onClick: () => {
+        onClick: async () => {
           dialog.setTitle(t('baseUserManage.setDataScope'))
-          model.policy!.name = model.username
           dialog.open()
+          if (formType === 'add') {
+            model.policy = {
+              value: [],
+              name: model.username,
+              policy_type: '',
+            }
+          }
+          if (formType === 'edit' && model.policy) {
+            model.policy.name = model.username
+            if (model.policy.policy_type === 'CUSTOM_FUNC') {
+              model.policy.func_name = model.policy.value
+            }
+            if (model.policy.policy_type === 'CUSTOM_DEPT') {
+              await nextTick(() => {
+                scopeRef.value.deptRef.elTree?.setCheckedKeys(model.policy.value, true)
+              })
+            }
+          }
         },
       },
       itemSlots: {
diff --git a/web/src/modules/base/views/permission/user/form.vue b/web/src/modules/base/views/permission/user/form.vue
index d05bd1413..743849d5a 100644
--- a/web/src/modules/base/views/permission/user/form.vue
+++ b/web/src/modules/base/views/permission/user/form.vue
@@ -50,7 +50,7 @@ useForm('userForm').then((form: MaFormExpose) => {
       userModel.value[key] = data[key]
     })
   }
-  form.setItems(getFormItems(formType, t, userModel.value, deptData, maDialog))
+  form.setItems(getFormItems(formType, t, userModel.value, deptData, maDialog, scopeRef))
   form.setOptions({
     labelWidth: '90px',
   })

From 46b11fdc88caaac6a4b282fed19dfafac7d5bb91 Mon Sep 17 00:00:00 2001
From: "X.Mo" <root@imoi.cn>
Date: Fri, 25 Apr 2025 20:42:56 +0800
Subject: [PATCH 46/91] fix: UserRequest

---
 app/Http/Admin/Request/Permission/UserRequest.php | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/app/Http/Admin/Request/Permission/UserRequest.php b/app/Http/Admin/Request/Permission/UserRequest.php
index 0a91dc563..7afc4f19e 100644
--- a/app/Http/Admin/Request/Permission/UserRequest.php
+++ b/app/Http/Admin/Request/Permission/UserRequest.php
@@ -69,18 +69,11 @@ public function rules(): array
             'policy.policy_type' => [
                 'required_with:policy',
                 'string',
-                'max:10',
+                'max:20',
                 Rule::enum(PolicyType::class),
             ],
             'policy.value' => [
                 'sometimes',
-                'array',
-                'min:1',
-            ],
-            'policy.is_default' => [
-                'sometimes',
-                'integer',
-                'in:0,1',
             ],
             'department' => [
                 'sometimes',

From 287e823bd32298e7a8807e9338925d89e3a8d3f0 Mon Sep 17 00:00:00 2001
From: "X.Mo" <root@imoi.cn>
Date: Mon, 28 Apr 2025 14:44:45 +0800
Subject: [PATCH 47/91] fix: README.md

---
 README-en.md  | 255 ++++++++++++++++++++------------------------------
 README.md     |   9 +-
 web/README.md |  85 -----------------
 3 files changed, 111 insertions(+), 238 deletions(-)
 delete mode 100644 web/README.md

diff --git a/README-en.md b/README-en.md
index 64e8723fe..4e75ff622 100644
--- a/README-en.md
+++ b/README-en.md
@@ -1,171 +1,122 @@
-[中文](./README.md) | English
-# Projects
-
-<p align="center">
-    <img src="https://doc.mineadmin.com/logo.svg" width="120" />
-</p>
-<p align="center">
-    <a href="https://www.mineadmin.com" target="_blank">official website</a> |
-    <a href="https://doc.mineadmin.com" target="_blank">Document</a> | 
-    <a href="https://demo.mineadmin.com" target="_blank">Demo</a> |
-    <a href="https://hyperf.wiki/3.0/#/" target="_blank">Hyperf Official Document</a> 
-</p>
-
-<p align="center">
-    <img src="https://gitee.com/xmo/MineAdmin/badge/star.svg?theme=dark" />
-    <img src="https://gitee.com/xmo/MineAdmin/badge/fork.svg?theme=dark" />
-    <img src="https://svg.hamm.cn/badge.svg?key=License&value=Apache-2.0&color=da4a00" />
-    <img src="https://svg.hamm.cn/badge.svg?key=MineAdmin&value=v2.0 LTS" />
-</p>
-
-## Projects Description
-
-PHP has a lot of good backend management system, but Swoole based backend management system did not find suitable for my own.
-So it developed a set of background management system. The system can be used for website management background , CMS, CRM, OA, ERP and so on.
-
-Background system based on Hyperf framework development. Enterprise-level architecture layered to easily support startups and personal pre-development use , using a small amount of server resources comparable to the performance of static language .
-Front-end use of Vue3 + Vite4 + Pinia + Arco, one end of the adaptation of PC, mobile, tablet!
-
-If you think it's not bad, please point a ⭐star support it, it will be the biggest support and encouragement to me!
-Please read [Disclaimer](https://doc.mineadmin.com/guide/start/declaration.html) and agree to it before using MineAdmin.
-
-- Tencent Cloud Special Offer: [Click to enter](http://txy.mineadmin.com)
-- AliCloud Special Offer：[Click to enter](http://aly.mineadmin.com)
-
-## Front-end repository address
-Move to the front-end repository
-
-- [Github MineAdmin-Vue](https://github.com/mineadmin/MineAdmin-Vue)
-- [Gitee MineAdmin-Vue](https://gitee.com/mineadmin/MineAdmin-vue)
-
-## Official communication group
-> QQ group for communication and learning, please do not water group.
-
-<img src="https://svg.hamm.cn/badge.svg?key=QQ群&value=150105478" />
-
-## Built-in functions
-
-1. user management, complete the user add, modify, delete configuration, support for different users to log in the background to see different home page
-2. department management, departmental organization (company, department, group), tree structure show support for data permissions
-3. position management, you can configure the user's position
-4. role management, role menu rights allocation, role data rights allocation
-5. menu management, configure system menus and buttons, etc.
-6. dictionary management, the system often used and fixed data can be reused and maintained
-7. system configuration, some common settings of the system management
-8. operation log, the query of some normal operations of the system by users.
-9. login log, user login system record query
-10. online users, view the current logged-in users
-11. service monitoring, view the current server status and PHP environment and other information
-12. attachment management, management of the current system to upload files and pictures and other information
-13. data table maintenance, the system's data table can be cleaned up debris and optimization
-14. module management, manage all modules of the system
-15. timed tasks, online (add, modify, delete) task scheduling including execution results logs
-16. code generation, front and back-end code generation (php, vue, js, sql), support for downloading and generating to the module.
-17. cache monitoring , view the Redis information and the system used key information
-18. API management , application and interface management , interface authorization and other functions. Interface documents are automatically generated , input and output parameter checking , etc.
-19. queue management, message queue management functions, message management, message sending. The use of ws mode instant messaging reminders (need to install rabbitMQ)
-20. application market , you can download a variety of basic applications , plug-ins , front-end components , etc. (under development ...)
-
-## Environment requirements
-
-- Swoole >= 5.0 with `Short Name` turned off.
-- PHP >= 8.1 and turn on the following extensions:
-    - mbstring
-    - json
-    - pdo
-    - openssl
-    - redis
-    - pcntl
-- Mysql >= 5.7
-- Redis >= 4.0
-- Git >= 2.x
-
-
-## Download the project
-- Please note that MineAdmin does not use SQL file import for installation, the system uses Migrates migration files to install and populate the data.
-
-- To download the project, make sure you have installed ``Composer``.
-```shell
-git clone https://gitee.com/xmo/MineAdmin && cd MineAdmin
-composer config -g repo.packagist composer https://mirrors.tencent.com/composer/
-composer install
-```
-
-## Project Installation
-
-Open a terminal, execute the install command, and follow the prompts to configure the `.env` file step by step.
-```shell
-php bin/hyperf.php mine:install
-```
-
-When prompted with the following message
-```shell
-Reset the ".env" file. Please restart the service before running 
-the installation command to continue the installation.
-```
-
-Execute the installation command again to execute the Migrates data migration file and SQL data fill to complete the installation.
-```shell
-php bin/hyperf.php mine:install
-```
-
-[Click here -> for FAQ](https://doc.mineadmin.com/faqs/)
+[Chinese](./README.md) | English
+# Project Introduction  
+
+<p align="center">  
+    <img src="https://doc.mineadmin.com/logo.svg" width="120" />  
+</p>  
+<p align="center">  
+    <a href="https://www.mineadmin.com" target="_blank">Official Website</a> |  
+    <a href="https://doc.mineadmin.com" target="_blank">Documentation</a> |  
+    <a href="https://demo.mineadmin.com" target="_blank">Demo</a> |  
+    <a href="https://hyperf.wiki/3.0/#/" target="_blank">Hyperf Official Docs</a>  
+</p>  
+
+## Project Introduction  
+
+There are many excellent PHP backend management systems, but I couldn’t find one based on Swoole that suited my needs.  
+So, I developed a backend management system. It can be used for website admin panels, CMS, CRM, OA, ERP, and more.  
+
+The backend system is built on the Hyperf framework. With an enterprise-level architecture, it easily supports startups and individuals in their early stages, delivering performance comparable to static languages with minimal server resources.  
+The frontend uses Vue3 + Vite4 + Pinia + Arco, adapting seamlessly to PC, mobile, and tablet devices.  
+
+If you find it useful, please give it a ⭐star—it would mean a lot to me and be a great encouragement!  
+Before using MineAdmin, please read the [Disclaimer](https://doc.mineadmin.com/guide/start/declaration.html) carefully and agree to its terms.  
+
+## Default Main Branch (without department, position, or data permission features)  
+The current branch includes features such as departments, positions, and data permissions. If you do not need these features, please switch to the [`【Main Branch】`](https://github.com/mineadmin/MineAdmin) to download the code.  
+
+## Official Community  
+> QQ group for discussion and learning—please avoid spamming.  
+
+<img src="https://svg.hamm.cn/badge.svg?key=QQ Group&value=150105478" />  
+
+## Strategic Partnership  
+[Jingcedun High-Protection CDN - Reliable Anti-DDoS/CC Attack Service](https://www.jcdun.com/guoneigaofangcdn)  
+
+## Built-in Features  
+
+1. **User Management**: Add, modify, and delete users; supports different homepages for different users.  
+2. **Role Management**: Assign menu permissions and data permissions to roles.  
+3. **Menu Management**: Configure system menus and buttons.  
+4. **Operation Logs**: Track and query user actions.  
+5. **Login Logs**: Record and query user login history.  
+6. **Attachment Management**: Manage uploaded files and images.  
+7. **Department Management**: Organize company structures.  
+8. **Position Management**: Assign positions within departments and allocate users to positions.  
+9. **Data Permissions**: Configure data permissions per position; can also override per user.  
+10. **App Market**: Download various basic apps, plugins, frontend components, and more.  
+
+## Requirements  
+
+- Swoole >= 5.0 (with `Short Name` disabled)  
+- PHP >= 8.1 with the following extensions enabled:  
+  - mbstring  
+  - json  
+  - pdo  
+  - openssl  
+  - redis  
+  - pcntl  
+- [x] MySQL >= 5.7  
+- [x] PostgreSQL >= 10  
+- [x] SQL Server (Latest)  
+- SQLSRV (Latest)  
+- Redis >= 4.0  
+- Git >= 2.x  
+
+## Download the Project  
+- MineAdmin does not use SQL file imports for installation. Instead, it uses Migrate files for setup and data seeding.  
+
+- To download the project (ensure `Composer` is installed):  
+```shell  
+composer create-project mineadmin/mineadmin --keep-vcs  
+```  
 
 ## Disclaimer
 [Disclaimer](https://doc.mineadmin.com/guide/start/declaration.html)
 
-The use of this software shall not be used to develop any software or application that violates the relevant national policies, and `MineAdmin` has nothing to do with any legal responsibility caused by the use of this software.
+This software must not be used to develop applications that violate national policies. `MineAdmin` bears no legal responsibility for any misuse.
 
-## Trial Addresses
+## Demo Access
+[Demo](https://demo.mineadmin.com)
+- Username: **superAdmin**
+- Password: **admin123**
 
-[Experience Address](https://demo.mineadmin.com)
-- Account: superAdmin
-- Password: admin123
-
-> Please do not add dirty data
+> Please avoid adding test data.
 
 ## Acknowledgments
 
-> The following are in no particular order
-
-[Hyperf a high-performance enterprise-class concurrent programming framework](https://hyperf.io/)
-
-[Element Plus is a component library for designers and developers based on Vue 3.](https://element-plus.org/)
-
-[Swoole PHP Concurrent Programming Framework](https://www.swoole.com)
+> Listed in no particular order
 
-[Vue](https://vuejs.org/)
+[Hyperf - A high-performance enterprise coroutine framework](https://hyperf.io/)  
+[Element Plus - A Vue 3-based component library for designers and developers](https://element-plus.org/)  
+[Swoole - PHP coroutine framework](https://www.swoole.com)  
+[Vue](https://vuejs.org/)  
+[Vite](https://vitejs.cn/)  
+[Jetbrains - Productivity tools](https://www.jetbrains.com/)
 
-[Vite](https://vitejs.cn/)
+## OSCS Security Certification
+[![OSCS Status](https://www.oscs1024.com/platform/badge/kanyxmo/MineAdmin.svg?size=large)](https://www.murphysec.com/dr/9ztZvuSN6OLFjCDGVo)
 
-[Jetbrains Productivity Tools](https://www.jetbrains.com/)
-
-## OSCS Security Certified
-![OSCS Status](https://www.oscs1024.com/platform/badge/kanyxmo/MineAdmin.svg?size=large)
-
-## Stargazers over time
+## Star History
 
 [![Stargazers over time](https://starchart.cc/mineadmin/mineadmin.svg)](https://starchart.cc/mineadmin/mineadmin.svg)
 
-Thank you to all the code contributors who have participated in the development of MineAdmin。 [[contributors](https://github.com/mineadmin/minedmin/graphs/contributors)]
-<a href="https://github.com/mineadmin/mineadmin/graphs/contributors">
-<img src="https://contrib.rocks/image?repo=mineadmin/mineadmin" />
+## Contributors
+
+> Thanks to all contributors who helped develop MineAdmin. [[contributors](https://github.com/mineadmin/minedmin/graphs/contributors)]  
+<a href="https://github.com/mineadmin/mineadmin/graphs/contributors">  
+<img src="https://contrib.rocks/image?repo=mineadmin/mineadmin" />  
 </a>
 
 [![Contributor Trends](https://contributor-overtime-api.apiseven.com/contributors-svg?chart=contributorOverTime&repo=mineadmin/mineadmin)](https://www.apiseven.com/en/contributor-graph?chart=contributorOverTime&repo=mineadmin/mineadmin)
 
-
-## Demo image
-<img src="https://s1.ax1x.com/2022/07/31/vklKzR.jpg" />
-<img src="https://s1.ax1x.com/2022/07/31/vkl8eK.jpg" />
-<img src="https://s1.ax1x.com/2022/07/31/vkl1L6.jpg" />
-<img src="https://s1.ax1x.com/2022/07/31/vklNJH.jpg" />
-<img src="https://s1.ax1x.com/2022/07/31/vklJoD.jpg" />
-<img src="https://s1.ax1x.com/2022/07/31/vkllsx.jpg" />
-<img src="https://s1.ax1x.com/2022/07/31/vklZoF.jpg" />
-<img src="https://s1.ax1x.com/2022/07/31/vklUWd.jpg" />
-<img src="https://s1.ax1x.com/2022/07/31/vkl0yt.jpg" />
-<img src="https://s1.ax1x.com/2022/07/31/vkltFe.jpg" />
-<img src="https://s1.ax1x.com/2022/07/31/vkluW9.jpg" />
-<img src="https://s1.ax1x.com/2022/07/31/vklnJJ.jpg" />
-<img src="https://s1.ax1x.com/2022/07/31/vklmi4.jpg" />
\ No newline at end of file
+## Demo Screenshots
+[![pAdQKPJ.png](https://s21.ax1x.com/2024/10/22/pAdQKPJ.png)](https://imgse.com/i/pAdQKPJ)  
+[![pAdQlx1.png](https://s21.ax1x.com/2024/10/22/pAdQlx1.png)](https://imgse.com/i/pAdQlx1)  
+[![pAdQQ2R.png](https://s21.ax1x.com/2024/10/22/pAdQQ2R.png)](https://imgse.com/i/pAdQQ2R)  
+[![pAdQGqK.png](https://s21.ax1x.com/2024/10/22/pAdQGqK.png)](https://imgse.com/i/pAdQGqK)  
+[![pAdQYVO.png](https://s21.ax1x.com/2024/10/22/pAdQYVO.png)](https://imgse.com/i/pAdQYVO)  
+[![pAdQNIe.png](https://s21.ax1x.com/2024/10/22/pAdQNIe.png)](https://imgse.com/i/pAdQNIe)  
+[![pAdQaPH.png](https://s21.ax1x.com/2024/10/22/pAdQaPH.png)](https://imgse.com/i/pAdQaPH)  
+[![pAdQdGd.png](https://s21.ax1x.com/2024/10/22/pAdQdGd.png)](https://imgse.com/i/pAdQdGd)
+```
\ No newline at end of file
diff --git a/README.md b/README.md
index cc6f1531c..7972863de 100644
--- a/README.md
+++ b/README.md
@@ -22,6 +22,10 @@ PHP有很多优秀的后台管理系统，但基于Swoole的后台管理系统
 如果觉着还不错的话，就请点个 ⭐star 支持一下吧，这将是对我最大的支持和鼓励！
 在使用 MineAdmin 前请认真阅读[《免责声明》](https://doc.mineadmin.com/guide/start/declaration.html)并同意该声明。
 
+## 默认主分支（不包含部门、岗位、数据权限功能）
+当前分支带有部门、岗位、数据权限等功能，如果不需要使用这些功能请移步 [`【主分支】`](https://github.com/mineadmin/MineAdmin) 下载代码
+
+
 ## 官方交流群
 > QQ群用于交流学习，请勿水群
 
@@ -38,7 +42,10 @@ PHP有很多优秀的后台管理系统，但基于Swoole的后台管理系统
 4. 操作日志，用户对系统的一些正常操作的查询
 5. 登录日志，用户登录系统的记录查询
 6. 附件管理，管理当前系统上传的文件及图片等信息
-7. 应用市场，可下载各种基础应用、插件、前端组件等等
+7. 部门管理，可以管理组织架构
+8. 岗位管理，在部门内管理，可以为部门设置岗位，再为用户分配岗位
+9. 数据权限，数据权限功能跟随岗位而设置，同时，也可以对用户单独设置数据权限，使岗位的数据权限失效。
+10. 应用市场，可下载各种基础应用、插件、前端组件等等
 
 ## 环境需求
 
diff --git a/web/README.md b/web/README.md
deleted file mode 100644
index 74c164a95..000000000
--- a/web/README.md
+++ /dev/null
@@ -1,85 +0,0 @@
-<p align="center">
-  <img src="https://doc.mineadmin.com/logo.svg" width="120" />
-</p>
-<p align="center">
-  <img src="https://svg.hamm.cn/badge.svg?key=License&value=MIT" />
-  <img src="https://svg.hamm.cn/badge.svg?key=Version&value=2.0%20LTS" />
-</p>
-
-## 简介
-`MineAdmin Vue` 是一个开源免费专门适配于 `MineAdmin` 后台权限管理系统的前端中后台模板，使用了 `vue3`, `vite5`, `pinia`, `arco design`, `javascript` 等主流开发技术，未使用`Typescript`，我们选择了简单。
-
-在使用 MineAdmin Vue 前请认真阅读[《免责声明》](https://doc.mineadmin.com/guide/start/declaration.html)并同意该声明。
-
-## 特性
-
-- 最新技术栈：vue3, vite5, pinia
-- UI库：arco design
-- 国际化：完善的多语言解决方案
-- 权限：由于适配 `MineAdmin` 系统，内置完善的权限、动/静态路由解决方案
-- 主题：可扩展主题
-- 布局：支持三种布局方式
-- 组件：内置大量基于日常开发锤炼出的组件。
-- 指令：封装了常用指令，如权限控制、角色控制等
-- CRUD表格系统：基于json方式配置，快速对接后台接口，实现增删改查
-- FROM表单系统：基于json方式配置，快速搭建出想要的表单系统，快速完成需求。
-
-## 安装使用
-
-- 获取代码
-```
-git clone https://github.com/kanyxmo/MineAdmin-Vue.git
-```
-或
-```
-git clone https://gitee.com/xmo/mineadmin-vue.git
-```
-- 安装依赖
-```
-cd MineAdmin-Vue && yarn install
-```
-- 运行
-```
-yarn dev
-```
-- 打包
-```
-yarn build
-```
-
-## 免责声明
-本软件不得用于开发违反国家有关政策的相关软件和应用，若因使用本软件造成的一切法律责任均与 `MineAdmin Vue` 无关
-
-## 协议说明
-`MineAdmin Vue` 遵循MIT开源协议发布，免费开源。
-
-版权所有Copyright © 2020-2024 by MineAdmin (http://www.mineadmin.com)
-
-All rights reserved。
-
-## 通过OSCS安全认证
-
-<a href="https://www.oscs1024.com/project/oscs/kanyxmo/MineAdmin-Vue?ref=badge_large" alt="OSCS Status"><img src="https://www.oscs1024.com/platform/badge/kanyxmo/MineAdmin-Vue.svg?size=large"/></a>
-
-## 系统截图
-<img src="https://s1.ax1x.com/2022/07/31/vklKzR.jpg" />
-<img src="https://s1.ax1x.com/2022/07/31/vklGdO.jpg" />
-<img src="https://s1.ax1x.com/2022/07/31/vkl8eK.jpg" />
-<img src="https://s1.ax1x.com/2022/07/31/vkl1L6.jpg" />
-<img src="https://s1.ax1x.com/2022/07/31/vklwQI.jpg" />
-<img src="https://s1.ax1x.com/2022/07/31/vkldSA.jpg" />
-<img src="https://s1.ax1x.com/2022/07/31/vklNJH.jpg" />
-<img src="https://s1.ax1x.com/2022/07/31/vklJoD.jpg" />
-<img src="https://s1.ax1x.com/2022/07/31/vkllsx.jpg" />
-<img src="https://s1.ax1x.com/2022/07/31/vklZoF.jpg" />
-<img src="https://s1.ax1x.com/2022/07/31/vklUWd.jpg" />
-<img src="https://s1.ax1x.com/2022/07/31/vkl0yt.jpg" />
-<img src="https://s1.ax1x.com/2022/07/31/vkltFe.jpg" />
-<img src="https://s1.ax1x.com/2022/07/31/vkluW9.jpg" />
-<img src="https://s1.ax1x.com/2022/07/31/vklnJJ.jpg" />
-<img src="https://s1.ax1x.com/2022/07/31/vklmi4.jpg" />
-
-## 鸣谢
-项目基于 [Fantastic-startkit启动套件](https://hooray.github.io/fantastic-startkit/) 构建，
-菜单等部分功能实现借鉴于 [Fantastic-admin](https://fantastic-admin.hurui.me/) 项目。
-感谢开源作者 [Hooray](https://github.com/hooray) 的对开源社区的贡献。

From 362ec562b767dee78152f3dfcc0ec5b629f1a4a3 Mon Sep 17 00:00:00 2001
From: "X.Mo" <root@imoi.cn>
Date: Mon, 28 Apr 2025 16:07:08 +0800
Subject: [PATCH 48/91] =?UTF-8?q?chore(deps):=20=E5=8D=87=E7=BA=A7=20@mine?=
 =?UTF-8?q?admin/form=20=E5=92=8C=20@mineadmin/pro-table=20=E4=BE=9D?=
 =?UTF-8?q?=E8=B5=96=E7=89=88=E6=9C=AC=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/package.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/web/package.json b/web/package.json
index 7891b7c7e..bbdad65c7 100644
--- a/web/package.json
+++ b/web/package.json
@@ -20,14 +20,14 @@
   "dependencies": {
     "@imengyu/vue3-context-menu": "^1.4.4",
     "@mineadmin/echarts": "^1.0.5",
-    "@mineadmin/form": "^1.0.25",
-    "@mineadmin/pro-table": "^1.0.61",
+    "@mineadmin/form": "^1.0.30",
+    "@mineadmin/pro-table": "^1.0.63",
     "@mineadmin/search": "^1.0.31",
     "@mineadmin/table": "^1.0.33",
     "@vueuse/core": "^12.7.0",
     "@vueuse/integrations": "^12.7.0",
     "animate.css": "^4.1.1",
-    "axios": "^1.7.9",
+    "axios": "^1.8.2",
     "dayjs": "^1.11.13",
     "echarts": "^5.6.0",
     "element-plus": "^2.9.5",
@@ -46,7 +46,7 @@
     "sortablejs": "1.15.6",
     "vaul-vue": "^0.3.0",
     "vue": "^3.5.13",
-    "vue-i18n": "^11.1.1",
+    "vue-i18n": "^11.1.2",
     "vue-m-message": "^4.0.2",
     "vue-router": "^4.5.0",
     "web-storage-cache": "^1.1.1"

From 7b070248e05d55627d8b4a0329fc0a0913e515b0 Mon Sep 17 00:00:00 2001
From: "X.Mo" <root@imoi.cn>
Date: Mon, 28 Apr 2025 16:07:33 +0800
Subject: [PATCH 49/91] =?UTF-8?q?chore(deps):=20=E5=8D=87=E7=BA=A7=20@mine?=
 =?UTF-8?q?admin/form=20=E5=92=8C=20@mineadmin/pro-table=20=E4=BE=9D?=
 =?UTF-8?q?=E8=B5=96=E7=89=88=E6=9C=AC=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/package.json b/web/package.json
index bbdad65c7..e036fbbd9 100644
--- a/web/package.json
+++ b/web/package.json
@@ -90,7 +90,7 @@
     "unplugin-auto-import": "^19.1.0",
     "unplugin-vue-components": "^28.4.0",
     "vconsole": "^3.15.1",
-    "vite": "^6.1.1",
+    "vite": "^6.2.6",
     "vite-plugin-chunk-split": "^0.5.0",
     "vite-plugin-compression2": "^1.3.3",
     "vite-plugin-fake-server": "^2.2.0",

From 9cfaf1295e82db93329dd24a814c78327ebd3e69 Mon Sep 17 00:00:00 2001
From: "X.Mo" <root@imoi.cn>
Date: Mon, 28 Apr 2025 16:17:16 +0800
Subject: [PATCH 50/91] =?UTF-8?q?chore(deps):=20=E5=8D=87=E7=BA=A7=20@mine?=
 =?UTF-8?q?admin/form=20=E4=BE=9D=E8=B5=96=E7=89=88=E6=9C=AC=E8=87=B3=20^1?=
 =?UTF-8?q?.0.33?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/package.json b/web/package.json
index e036fbbd9..cf103622a 100644
--- a/web/package.json
+++ b/web/package.json
@@ -20,7 +20,7 @@
   "dependencies": {
     "@imengyu/vue3-context-menu": "^1.4.4",
     "@mineadmin/echarts": "^1.0.5",
-    "@mineadmin/form": "^1.0.30",
+    "@mineadmin/form": "^1.0.33",
     "@mineadmin/pro-table": "^1.0.63",
     "@mineadmin/search": "^1.0.31",
     "@mineadmin/table": "^1.0.33",

From 74bbded6a6efea25e2cd73d337d5ecba7607ca9a Mon Sep 17 00:00:00 2001
From: "X.Mo" <root@imoi.cn>
Date: Tue, 29 Apr 2025 11:53:37 +0800
Subject: [PATCH 51/91] =?UTF-8?q?refactor(ma-dict-select):=20=E9=87=8D?=
 =?UTF-8?q?=E6=9E=84=E5=AD=97=E5=85=B8=E9=80=89=E6=8B=A9=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E7=BB=93=E6=9E=84=E5=B9=B6=E5=8D=87=E7=BA=A7?=
 =?UTF-8?q?element-plus=E8=87=B32.9.9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/package.json                              |  2 +-
 .../ma-dict-picker/ma-dict-select.vue         | 19 +++++++++----------
 .../views/permission/component/dataScope.vue  |  2 +-
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/web/package.json b/web/package.json
index cf103622a..41be9c2de 100644
--- a/web/package.json
+++ b/web/package.json
@@ -30,7 +30,7 @@
     "axios": "^1.8.2",
     "dayjs": "^1.11.13",
     "echarts": "^5.6.0",
-    "element-plus": "^2.9.5",
+    "element-plus": "^2.9.9",
     "floating-vue": "5.2.2",
     "lodash-es": "^4.17.21",
     "md-editor-v3": "^5.3.0",
diff --git a/web/src/components/ma-dict-picker/ma-dict-select.vue b/web/src/components/ma-dict-picker/ma-dict-select.vue
index 07ea3c032..0d54693d5 100644
--- a/web/src/components/ma-dict-picker/ma-dict-select.vue
+++ b/web/src/components/ma-dict-picker/ma-dict-select.vue
@@ -40,17 +40,16 @@ const model = defineModel<any>()
 
 <template>
   <el-select v-model="model" v-bind="$attrs">
-    <slot name="default">
-      <template v-if="dictionaryData">
-        <template v-for="item in dictionaryData as Dictionary[]" :key="item">
-          <el-option :value="item.value" :label="item?.i18n ? t(item.i18n) : item.label">
-            <slot v-if="$slots.optionDefault" name="optionDefault" />
-          </el-option>
-        </template>
-      </template>
-    </slot>
     <template v-for="slot in Object.keys($slots)" #[slot]>
-      <slot v-if="slot !== 'default'" :name="slot" />
+      <slot :name="slot">
+        <template v-if="dictionaryData && slot === 'default'">
+          <template v-for="item in dictionaryData as Dictionary[]" :key="item">
+            <el-option :value="item.value" :label="item?.i18n ? t(item.i18n) : item.label">
+              <slot v-if="$slots.optionDefault" name="optionDefault" />
+            </el-option>
+          </template>
+        </template>
+      </slot>
     </template>
   </el-select>
 </template>
diff --git a/web/src/modules/base/views/permission/component/dataScope.vue b/web/src/modules/base/views/permission/component/dataScope.vue
index 0965f58ea..99d242f24 100644
--- a/web/src/modules/base/views/permission/component/dataScope.vue
+++ b/web/src/modules/base/views/permission/component/dataScope.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
 import type { MaFormItem } from '@mineadmin/form'
-import MaDictSelect from '@/components/ma-dict-picker/ma-dict-select.vue'
 import { page as deptList } from '~/base/api/department.ts'
 import MaTree from '@/components/ma-tree/index.vue'
+import MaDictSelect from '@/components/ma-dict-picker/ma-dict-select.vue'
 
 defineOptions({ name: 'DataScope' })
 

From c5a9f63207b7a3c9d932c0f94b156114ac2b024b Mon Sep 17 00:00:00 2001
From: "X.Mo" <root@imoi.cn>
Date: Tue, 29 Apr 2025 12:18:27 +0800
Subject: [PATCH 52/91] =?UTF-8?q?feat:=20=E5=8D=87=E7=BA=A7=E4=BE=9D?=
 =?UTF-8?q?=E8=B5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/package.json b/web/package.json
index 41be9c2de..ed6e0c705 100644
--- a/web/package.json
+++ b/web/package.json
@@ -21,8 +21,8 @@
     "@imengyu/vue3-context-menu": "^1.4.4",
     "@mineadmin/echarts": "^1.0.5",
     "@mineadmin/form": "^1.0.33",
-    "@mineadmin/pro-table": "^1.0.63",
-    "@mineadmin/search": "^1.0.31",
+    "@mineadmin/pro-table": "^1.0.67",
+    "@mineadmin/search": "^1.0.33",
     "@mineadmin/table": "^1.0.33",
     "@vueuse/core": "^12.7.0",
     "@vueuse/integrations": "^12.7.0",

From 0e230784b9713f16fe34ba12a69680a8a51646e2 Mon Sep 17 00:00:00 2001
From: "X.Mo" <root@imoi.cn>
Date: Wed, 30 Apr 2025 16:31:23 +0800
Subject: [PATCH 53/91] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20ma-form=20?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=20children=20=E9=85=8D=E7=BD=AE=E9=A1=B9?=
 =?UTF-8?q?=E5=90=8E=EF=BC=8C=E9=80=A0=E6=88=90=E7=BB=84=E4=BB=B6=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E6=8F=92=E6=A7=BD=E5=8F=82=E6=95=B0=E4=B8=A2=E5=A4=B1?=
 =?UTF-8?q?=E4=BB=A5=E5=8F=8A=20render=20=E5=87=BD=E6=95=B0=E9=87=8C=20jsx?=
 =?UTF-8?q?=20=E8=AF=AD=E6=B3=95=E7=9A=84=E5=AD=90=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E4=B8=8D=E6=B8=B2=E6=9F=93=E9=97=AE=E9=A2=98=EF=BC=8C=E5=90=8C?=
 =?UTF-8?q?=E6=97=B6=E4=BF=AE=E5=A4=8D=20ma-search=20=E5=85=BC=E5=AE=B9=20?=
 =?UTF-8?q?ma-form=20=E7=9A=84=E4=B8=80=E4=BA=9B=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/package.json                    | 4 ++--
 web/src/provider/mine-core/index.ts | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/web/package.json b/web/package.json
index ed6e0c705..ef4f69381 100644
--- a/web/package.json
+++ b/web/package.json
@@ -20,9 +20,9 @@
   "dependencies": {
     "@imengyu/vue3-context-menu": "^1.4.4",
     "@mineadmin/echarts": "^1.0.5",
-    "@mineadmin/form": "^1.0.33",
+    "@mineadmin/form": "^1.0.45",
     "@mineadmin/pro-table": "^1.0.67",
-    "@mineadmin/search": "^1.0.33",
+    "@mineadmin/search": "^1.0.35",
     "@mineadmin/table": "^1.0.33",
     "@vueuse/core": "^12.7.0",
     "@vueuse/integrations": "^12.7.0",
diff --git a/web/src/provider/mine-core/index.ts b/web/src/provider/mine-core/index.ts
index 1e7f87636..83b75762d 100644
--- a/web/src/provider/mine-core/index.ts
+++ b/web/src/provider/mine-core/index.ts
@@ -23,7 +23,7 @@ import MaTable from '@mineadmin/table'
 // maTable样式
 import '@mineadmin/table/dist/style.css'
 // maSearch样式
-import '@mineadmin/search/dist/style.css'
+import '@mineadmin/search/dist/search.css'
 // MaProTable样式
 import '@mineadmin/pro-table/dist/style.css'
 

From 5e58d1a89284955a7211a349b89e5bdd05a25f01 Mon Sep 17 00:00:00 2001
From: "X.Mo" <root@imoi.cn>
Date: Wed, 30 Apr 2025 16:33:50 +0800
Subject: [PATCH 54/91] =?UTF-8?q?fix:=20=E8=BF=98=E5=8E=9F=20ma-dict-selec?=
 =?UTF-8?q?t=20=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ma-dict-picker/ma-dict-select.vue         | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/web/src/components/ma-dict-picker/ma-dict-select.vue b/web/src/components/ma-dict-picker/ma-dict-select.vue
index 0d54693d5..07ea3c032 100644
--- a/web/src/components/ma-dict-picker/ma-dict-select.vue
+++ b/web/src/components/ma-dict-picker/ma-dict-select.vue
@@ -40,16 +40,17 @@ const model = defineModel<any>()
 
 <template>
   <el-select v-model="model" v-bind="$attrs">
-    <template v-for="slot in Object.keys($slots)" #[slot]>
-      <slot :name="slot">
-        <template v-if="dictionaryData && slot === 'default'">
-          <template v-for="item in dictionaryData as Dictionary[]" :key="item">
-            <el-option :value="item.value" :label="item?.i18n ? t(item.i18n) : item.label">
-              <slot v-if="$slots.optionDefault" name="optionDefault" />
-            </el-option>
-          </template>
+    <slot name="default">
+      <template v-if="dictionaryData">
+        <template v-for="item in dictionaryData as Dictionary[]" :key="item">
+          <el-option :value="item.value" :label="item?.i18n ? t(item.i18n) : item.label">
+            <slot v-if="$slots.optionDefault" name="optionDefault" />
+          </el-option>
         </template>
-      </slot>
+      </template>
+    </slot>
+    <template v-for="slot in Object.keys($slots)" #[slot]>
+      <slot v-if="slot !== 'default'" :name="slot" />
     </template>
   </el-select>
 </template>

From 4e92f6b4c2f900fabb20148b30d88ce1399bc595 Mon Sep 17 00:00:00 2001
From: "X.Mo" <root@imoi.cn>
Date: Wed, 30 Apr 2025 19:29:17 +0800
Subject: [PATCH 55/91] =?UTF-8?q?chore(deps):=20=E5=8D=87=E7=BA=A7=20@mine?=
 =?UTF-8?q?admin/form=20=E4=BE=9D=E8=B5=96=E7=89=88=E6=9C=AC=E8=87=B3=20^1?=
 =?UTF-8?q?.0.51?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/package.json b/web/package.json
index ef4f69381..fe4559e13 100644
--- a/web/package.json
+++ b/web/package.json
@@ -20,7 +20,7 @@
   "dependencies": {
     "@imengyu/vue3-context-menu": "^1.4.4",
     "@mineadmin/echarts": "^1.0.5",
-    "@mineadmin/form": "^1.0.45",
+    "@mineadmin/form": "^1.0.51",
     "@mineadmin/pro-table": "^1.0.67",
     "@mineadmin/search": "^1.0.35",
     "@mineadmin/table": "^1.0.33",

From 8beb22fb3ac06f6cff3e4ce065e97eeb8f28c230 Mon Sep 17 00:00:00 2001
From: "X.Mo" <root@imoi.cn>
Date: Fri, 9 May 2025 10:35:29 +0800
Subject: [PATCH 56/91] =?UTF-8?q?fix:=20=E8=BF=98=E5=8E=9Fmineadmin/search?=
 =?UTF-8?q?=E4=B8=8B=E7=9A=84style.css=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/package.json                    | 2 +-
 web/src/provider/mine-core/index.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/package.json b/web/package.json
index fe4559e13..e8a0717f0 100644
--- a/web/package.json
+++ b/web/package.json
@@ -22,7 +22,7 @@
     "@mineadmin/echarts": "^1.0.5",
     "@mineadmin/form": "^1.0.51",
     "@mineadmin/pro-table": "^1.0.67",
-    "@mineadmin/search": "^1.0.35",
+    "@mineadmin/search": "^1.0.37",
     "@mineadmin/table": "^1.0.33",
     "@vueuse/core": "^12.7.0",
     "@vueuse/integrations": "^12.7.0",
diff --git a/web/src/provider/mine-core/index.ts b/web/src/provider/mine-core/index.ts
index 83b75762d..1e7f87636 100644
--- a/web/src/provider/mine-core/index.ts
+++ b/web/src/provider/mine-core/index.ts
@@ -23,7 +23,7 @@ import MaTable from '@mineadmin/table'
 // maTable样式
 import '@mineadmin/table/dist/style.css'
 // maSearch样式
-import '@mineadmin/search/dist/search.css'
+import '@mineadmin/search/dist/style.css'
 // MaProTable样式
 import '@mineadmin/pro-table/dist/style.css'
 

From ae3045db0438cb6d732dbd17a888c044833d3497 Mon Sep 17 00:00:00 2001
From: "X.Mo" <root@imoi.cn>
Date: Wed, 14 May 2025 09:48:26 +0800
Subject: [PATCH 57/91] =?UTF-8?q?fix:=20=E6=9B=B4=E6=96=B0=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E4=BF=A1=E6=81=AF=E6=97=B6=EF=BC=8C=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=9D=83=E9=99=90=E5=80=BC=E9=9D=9E=E6=95=B0=E7=BB=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/src/modules/base/views/permission/user/form.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/web/src/modules/base/views/permission/user/form.vue b/web/src/modules/base/views/permission/user/form.vue
index 743849d5a..154a5e763 100644
--- a/web/src/modules/base/views/permission/user/form.vue
+++ b/web/src/modules/base/views/permission/user/form.vue
@@ -70,6 +70,9 @@ function add(): Promise<any> {
 // 更新操作
 function edit(): Promise<any> {
   return new Promise((resolve, reject) => {
+    if (userModel.value.policy === null) {
+      userModel.value.policy = []
+    }
     save(userModel.value.id as number, userModel.value).then((res: any) => {
       res.code === ResultCode.SUCCESS ? resolve(res) : reject(res)
     }).catch((err) => {

From f3bfbd412b9894add294a33278c57c00495e0e0f Mon Sep 17 00:00:00 2001
From: "X.Mo" <root@imoi.cn>
Date: Tue, 20 May 2025 14:33:52 +0800
Subject: [PATCH 58/91] =?UTF-8?q?feat:=20-=20=E6=96=B0=E5=A2=9E=E8=BF=9C?=
 =?UTF-8?q?=E7=A8=8BSFC=E5=8A=A0=E8=BD=BD=E7=BB=84=E4=BB=B6=E5=B9=B6?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AD=97=E5=85=B8=E9=80=89=E6=8B=A9=E5=99=A8?=
 =?UTF-8?q?=E7=A6=81=E7=94=A8=E7=8A=B6=E6=80=81=E6=94=AF=E6=8C=81=20-=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=94=A8=E6=88=B7=E7=BC=96=E8=BE=91=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E6=89=93=E5=BC=80=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=E5=BC=B9=E7=AA=97=E4=B8=8D=E6=98=BE=E7=A4=BA=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E5=90=8D=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/package.json                              |  3 +-
 web/src/components/ma-dialog/index.vue        |  2 +-
 .../ma-dict-picker/ma-dict-checkbox.vue       |  2 +-
 .../ma-dict-picker/ma-dict-radio.vue          |  2 +-
 .../ma-dict-picker/ma-dict-select.vue         |  2 +-
 .../components/ma-remote-sfc-loader/index.vue | 66 +++++++++++++++++++
 .../permission/user/data/getFormItems.tsx     | 21 +++---
 .../mine-admin/app-store/views/detail.vue     | 43 ++++++++++--
 web/types/components.d.ts                     |  1 +
 9 files changed, 124 insertions(+), 18 deletions(-)
 create mode 100644 web/src/components/ma-remote-sfc-loader/index.vue

diff --git a/web/package.json b/web/package.json
index e8a0717f0..f1597ff35 100644
--- a/web/package.json
+++ b/web/package.json
@@ -21,7 +21,7 @@
     "@imengyu/vue3-context-menu": "^1.4.4",
     "@mineadmin/echarts": "^1.0.5",
     "@mineadmin/form": "^1.0.51",
-    "@mineadmin/pro-table": "^1.0.67",
+    "@mineadmin/pro-table": "^1.0.69",
     "@mineadmin/search": "^1.0.37",
     "@mineadmin/table": "^1.0.33",
     "@vueuse/core": "^12.7.0",
@@ -49,6 +49,7 @@
     "vue-i18n": "^11.1.2",
     "vue-m-message": "^4.0.2",
     "vue-router": "^4.5.0",
+    "vue3-sfc-loader": "^0.9.5",
     "web-storage-cache": "^1.1.1"
   },
   "devDependencies": {
diff --git a/web/src/components/ma-dialog/index.vue b/web/src/components/ma-dialog/index.vue
index a4a95d3dd..6495d6ea8 100644
--- a/web/src/components/ma-dialog/index.vue
+++ b/web/src/components/ma-dialog/index.vue
@@ -105,7 +105,7 @@ onMounted(() => {
             {{ $attrs.title ?? '' }}
           </slot>
         </div>
-        <el-link class="el-dialog__headerbtn relative !right-[2px] !-top-[6px]" :underline="false">
+        <el-link class="el-dialog__headerbtn relative !right-[2px] !-top-[6px]" underline="never">
           <ma-svg-icon
             :name="fullscreen ? fsIcon.exit : fsIcon.todo"
             :size="15"
diff --git a/web/src/components/ma-dict-picker/ma-dict-checkbox.vue b/web/src/components/ma-dict-picker/ma-dict-checkbox.vue
index 5c0fffd25..24d54420d 100644
--- a/web/src/components/ma-dict-picker/ma-dict-checkbox.vue
+++ b/web/src/components/ma-dict-picker/ma-dict-checkbox.vue
@@ -45,7 +45,7 @@ const model = defineModel<any>()
     <slot name="default">
       <template v-if="dictionaryData">
         <template v-for="item in dictionaryData as Dictionary[]" :key="item">
-          <component :is="renderMode === 'normal' ? 'el-checkbox' : 'el-checkbox-button'" :value="item.value">
+          <component :is="renderMode === 'normal' ? 'el-checkbox' : 'el-checkbox-button'" :value="item.value" :disabled="item.disabled">
             <slot name="optionDefault">
               {{ item?.i18n ? t(item.i18n) : item.label }}
             </slot>
diff --git a/web/src/components/ma-dict-picker/ma-dict-radio.vue b/web/src/components/ma-dict-picker/ma-dict-radio.vue
index 55c59885f..16579a303 100644
--- a/web/src/components/ma-dict-picker/ma-dict-radio.vue
+++ b/web/src/components/ma-dict-picker/ma-dict-radio.vue
@@ -45,7 +45,7 @@ const model = defineModel<any>()
     <slot name="default">
       <template v-if="dictionaryData">
         <template v-for="item in dictionaryData as Dictionary[]" :key="item">
-          <component :is="renderMode === 'normal' ? 'el-radio' : 'el-radio-button'" :value="item.value">
+          <component :is="renderMode === 'normal' ? 'el-radio' : 'el-radio-button'" :value="item.value" :disabled="item.disabled">
             <slot name="optionDefault">
               {{ item?.i18n ? t(item.i18n) : item.label }}
             </slot>
diff --git a/web/src/components/ma-dict-picker/ma-dict-select.vue b/web/src/components/ma-dict-picker/ma-dict-select.vue
index 07ea3c032..dc2b03adf 100644
--- a/web/src/components/ma-dict-picker/ma-dict-select.vue
+++ b/web/src/components/ma-dict-picker/ma-dict-select.vue
@@ -43,7 +43,7 @@ const model = defineModel<any>()
     <slot name="default">
       <template v-if="dictionaryData">
         <template v-for="item in dictionaryData as Dictionary[]" :key="item">
-          <el-option :value="item.value" :label="item?.i18n ? t(item.i18n) : item.label">
+          <el-option :value="item.value" :label="item?.i18n ? t(item.i18n) : item.label" :disabled="item.disabled">
             <slot v-if="$slots.optionDefault" name="optionDefault" />
           </el-option>
         </template>
diff --git a/web/src/components/ma-remote-sfc-loader/index.vue b/web/src/components/ma-remote-sfc-loader/index.vue
new file mode 100644
index 000000000..dbb807870
--- /dev/null
+++ b/web/src/components/ma-remote-sfc-loader/index.vue
@@ -0,0 +1,66 @@
+<script setup lang="ts">
+import type { Component } from 'vue'
+import type { SFCModule } from '#/global'
+
+import * as Vue from 'vue'
+import { loadModule } from 'vue3-sfc-loader/dist/vue3-sfc-loader'
+import { useMessage } from '@/hooks/useMessage.ts'
+import { uid } from 'radash'
+
+import MaProTable from '@mineadmin/pro-table'
+
+defineOptions({ name: 'MaRemoteSfcLoader' })
+
+const {
+  url,
+  module = {},
+} = defineProps<{
+  url: string | (() => Promise<any>)
+  module?: SFCModule<any>
+}>()
+
+const builtInModule = {
+  vue: Vue,
+  useMessage,
+  useHttp,
+  MaProTable,
+}
+
+const name = ref(`${uid(8)}.vue`)
+const baseModule = ref<SFCModule<any>>(Object.assign(builtInModule, module))
+const remoteComponent = ref<Component>()
+
+const remoteOptions = ref({
+  moduleCache: baseModule.value,
+  async getFile() {
+    const template: string = '<template><div>页面加载失败</div></template>'
+    if (typeof url === 'string') {
+      const response = await useHttp().get(url as string)
+      name.value = `${response.data?.name ?? uid(7)}.vue`
+      return response.data?.content ?? template
+    }
+    else {
+      const response = await url?.()
+      name.value = `${response.data?.name ?? uid(7)}.vue`
+      return response.data?.content ?? template
+    }
+  },
+  addStyle(textContent: string) {
+    const style = Object.assign(document.createElement('style'), { textContent })
+    const ref = document.head.getElementsByTagName('style')[0] || null
+    document.head.insertBefore(style, ref)
+  },
+})
+
+remoteComponent.value = markRaw(defineAsyncComponent(() => loadModule(name.value, remoteOptions.value)))
+</script>
+
+<template>
+  <component
+    :is="remoteComponent"
+    v-bind="$attrs"
+  />
+</template>
+
+<style scoped lang="scss">
+</style>
diff --git a/web/src/modules/base/views/permission/user/data/getFormItems.tsx b/web/src/modules/base/views/permission/user/data/getFormItems.tsx
index 8f30fbef8..7ed4f483b 100644
--- a/web/src/modules/base/views/permission/user/data/getFormItems.tsx
+++ b/web/src/modules/base/views/permission/user/data/getFormItems.tsx
@@ -178,15 +178,20 @@ export default function getFormItems(
               policy_type: '',
             }
           }
-          if (formType === 'edit' && model.policy) {
-            model.policy.name = model.username
-            if (model.policy.policy_type === 'CUSTOM_FUNC') {
-              model.policy.func_name = model.policy.value
+          if (formType === 'edit') {
+            if (model.policy) {
+              model.policy.name = model.username
+              if (model.policy.policy_type === 'CUSTOM_FUNC') {
+                model.policy.func_name = model.policy.value
+              }
+              if (model.policy.policy_type === 'CUSTOM_DEPT') {
+                await nextTick(() => {
+                  scopeRef.value.deptRef.elTree?.setCheckedKeys(model.policy.value, true)
+                })
+              }
             }
-            if (model.policy.policy_type === 'CUSTOM_DEPT') {
-              await nextTick(() => {
-                scopeRef.value.deptRef.elTree?.setCheckedKeys(model.policy.value, true)
-              })
+            else {
+              model.policy = { name: model.username }
             }
           }
         },
diff --git a/web/src/plugins/mine-admin/app-store/views/detail.vue b/web/src/plugins/mine-admin/app-store/views/detail.vue
index f3450db35..e2be0ef47 100644
--- a/web/src/plugins/mine-admin/app-store/views/detail.vue
+++ b/web/src/plugins/mine-admin/app-store/views/detail.vue
@@ -308,11 +308,11 @@ defineExpose({ open })
                   :theme="settingStore.colorMode === 'dark' ? 'dark' : 'light'"
                   preview-theme="github"
                 />
-              <!--              <div v-if="dataList.my.includes(data?.app?.identifier)" class="border-t pt-2 dark:border-gray-700"> -->
-              <!--                <el-button> -->
-              <!--                  安装此版本 -->
-              <!--                </el-button> -->
-              <!--              </div> -->
+                <!--              <div v-if="dataList.my.includes(data?.app?.identifier)" class="border-t pt-2 dark:border-gray-700"> -->
+                <!--                <el-button> -->
+                <!--                  安装此版本 -->
+                <!--                </el-button> -->
+                <!--              </div> -->
               </div>
             </div>
           </template>
@@ -334,6 +334,39 @@ defineExpose({ open })
               </div>
             </div>
           </div>
+          <div class="w-full">
+            <el-descriptions :column="1" direction="vertical" bordered class="mt-3">
+              <el-descriptions-item label="最新版本">
+                <el-text>
+                  {{ data?.app?.desc.version ?? '-' }}
+                </el-text>
+              </el-descriptions-item>
+              <el-descriptions-item>
+                <el-divider class="my-1" />
+              </el-descriptions-item>
+              <el-descriptions-item label="兼容版本">
+                <el-text>
+                  支持 >= {{ data?.app?.desc.require ?? '-' }} 版本
+                </el-text>
+              </el-descriptions-item>
+              <el-descriptions-item>
+                <el-divider class="my-1" />
+              </el-descriptions-item>
+              <el-descriptions-item label="在线演示">
+                <el-link
+                  v-if="data?.app?.desc.preview_url"
+                  type="primary"
+                  :href="data.app.desc.preview_url"
+                  target="_blank"
+                >
+                  点击跳转
+                </el-link>
+                <el-text v-else>
+                  暂无
+                </el-text>
+              </el-descriptions-item>
+            </el-descriptions>
+          </div>
         </div>
       </div>
     </div>
diff --git a/web/types/components.d.ts b/web/types/components.d.ts
index 7bd02e8ce..54bb82630 100644
--- a/web/types/components.d.ts
+++ b/web/types/components.d.ts
@@ -21,6 +21,7 @@ declare module 'vue' {
     MaIconPicker: typeof import('./../src/components/ma-icon-picker/index.vue')['default']
     MaKeyValue: typeof import('./../src/components/ma-key-value/index.vue')['default']
     MaRemoteSelect: typeof import('./../src/components/ma-remote-select/index.vue')['default']
+    MaRemoteSfcLoader: typeof import('./../src/components/ma-remote-sfc-loader/index.vue')['default']
     MaResourcePicker: typeof import('./../src/components/ma-resource-picker/index.vue')['default']
     MaSelectTable: typeof import('./../src/components/ma-select-table/index.vue')['default']
     MaSvgIcon: typeof import('./../src/components/ma-svg-icon/index.vue')['default']

From ecbe81ac1d3bcc4660dadb7527f46286afc65775 Mon Sep 17 00:00:00 2001
From: "X.Mo" <root@imoi.cn>
Date: Thu, 22 May 2025 10:08:37 +0800
Subject: [PATCH 59/91] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=AD=90?=
 =?UTF-8?q?=E9=83=A8=E9=97=A8=E6=9C=AA=E8=8E=B7=E5=8F=96=E5=B2=97=E4=BD=8D?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Model/Permission/Department.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Model/Permission/Department.php b/app/Model/Permission/Department.php
index 1b008c0f6..2ebef45ef 100644
--- a/app/Model/Permission/Department.php
+++ b/app/Model/Permission/Department.php
@@ -76,7 +76,7 @@ public function leader(): BelongsToMany
 
     public function children(): HasMany
     {
-        return $this->hasMany(self::class, 'parent_id', 'id')->with('children');
+        return $this->hasMany(self::class, 'parent_id', 'id')->with(['children', 'positions']);
     }
 
     public function getFlatChildren(): BaseCollection

From 30deb4892616d7a5be005fcc412de31f43094f19 Mon Sep 17 00:00:00 2001
From: zds <49744633+zds-s@users.noreply.github.com>
Date: Fri, 23 May 2025 17:42:50 +0800
Subject: [PATCH 60/91] =?UTF-8?q?refactor(permission):=20=E9=87=8D?=
 =?UTF-8?q?=E6=9E=84=E6=9D=83=E9=99=90=E7=AE=A1=E7=90=86=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 移除了 BatchGrantDataPermissionForPositionRequest 中的 is_default 字段
- 优化了 Leader 模型和相关控制器、仓库的代码结构
-调整了 Position 模型的 policy 关系，从 belongsTo改为 hasOne
- 重构了 UserService 中的用户创建和更新逻辑，优化了策略数据的处理
- 删除了不必要的异常捕获和冗余代码
- 统一了代码格式和命名规范
---
 .../Permission/DepartmentController.php        |  3 ---
 .../Controller/Permission/LeaderController.php |  1 -
 .../Permission/PositionController.php          |  2 +-
 ...chGrantDataPermissionForPositionRequest.php | 18 +++++++++++-------
 .../Admin/Request/Permission/LeaderRequest.php |  2 +-
 .../Admin/Request/Permission/RoleRequest.php   |  4 +---
 .../Admin/Request/Permission/UserRequest.php   |  5 ++---
 app/Model/DataPermission/Policy.php            |  7 +++----
 app/Model/Permission/Leader.php                |  3 ---
 app/Model/Permission/Position.php              |  5 +++--
 app/Model/Permission/Role.php                  |  1 -
 .../Permission/DepartmentRepository.php        |  2 +-
 app/Repository/Permission/LeaderRepository.php | 15 +++++++--------
 .../Permission/PositionRepository.php          |  2 +-
 app/Service/Permission/PositionService.php     |  7 ++++++-
 app/Service/Permission/RoleService.php         |  3 ---
 app/Service/Permission/UserService.php         | 14 ++++++++------
 storage/languages/zh_CN/user.php               |  1 +
 .../views/permission/department/position.vue   |  4 ----
 .../permission/user/data/getFormItems.tsx      |  2 +-
 .../base/views/permission/user/form.vue        |  4 ----
 21 files changed, 47 insertions(+), 58 deletions(-)

diff --git a/app/Http/Admin/Controller/Permission/DepartmentController.php b/app/Http/Admin/Controller/Permission/DepartmentController.php
index 981e02723..47fd80ab1 100644
--- a/app/Http/Admin/Controller/Permission/DepartmentController.php
+++ b/app/Http/Admin/Controller/Permission/DepartmentController.php
@@ -12,14 +12,12 @@
 
 namespace App\Http\Admin\Controller\Permission;
 
-use App\Exception\BusinessException;
 use App\Http\Admin\Controller\AbstractController;
 use App\Http\Admin\Middleware\PermissionMiddleware;
 use App\Http\Admin\Request\Permission\DepartmentRequest;
 use App\Http\Common\Middleware\AccessTokenMiddleware;
 use App\Http\Common\Middleware\OperationMiddleware;
 use App\Http\Common\Result;
-use App\Http\Common\ResultCode;
 use App\Http\CurrentUser;
 use App\Schema\DepartmentSchema;
 use App\Service\Permission\DepartmentService;
@@ -116,5 +114,4 @@ public function delete(): Result
         $this->service->deleteById($this->getRequestData());
         return $this->success();
     }
-
 }
diff --git a/app/Http/Admin/Controller/Permission/LeaderController.php b/app/Http/Admin/Controller/Permission/LeaderController.php
index c1416eabe..e5e39be5a 100644
--- a/app/Http/Admin/Controller/Permission/LeaderController.php
+++ b/app/Http/Admin/Controller/Permission/LeaderController.php
@@ -27,7 +27,6 @@
 use Hyperf\Swagger\Annotation\HyperfServer;
 use Hyperf\Swagger\Annotation\JsonContent;
 use Hyperf\Swagger\Annotation\Post;
-use Hyperf\Swagger\Annotation\Put;
 use Hyperf\Swagger\Annotation\RequestBody;
 use Mine\Access\Attribute\Permission;
 use Mine\Swagger\Attributes\PageResponse;
diff --git a/app/Http/Admin/Controller/Permission/PositionController.php b/app/Http/Admin/Controller/Permission/PositionController.php
index 15be0d80d..5682d64d4 100644
--- a/app/Http/Admin/Controller/Permission/PositionController.php
+++ b/app/Http/Admin/Controller/Permission/PositionController.php
@@ -74,7 +74,7 @@ public function pageList(): Result
     )]
     #[Permission(code: 'permission:position:data_permission')]
     #[ResultResponse(instance: new Result())]
-    public function batchDataPermission(int $id,BatchGrantDataPermissionForPositionRequest $request): Result
+    public function batchDataPermission(int $id, BatchGrantDataPermissionForPositionRequest $request): Result
     {
         $this->service->batchDataPermission($id, $request->validated());
         return $this->success();
diff --git a/app/Http/Admin/Request/Permission/BatchGrantDataPermissionForPositionRequest.php b/app/Http/Admin/Request/Permission/BatchGrantDataPermissionForPositionRequest.php
index f90e445dc..118136d5d 100644
--- a/app/Http/Admin/Request/Permission/BatchGrantDataPermissionForPositionRequest.php
+++ b/app/Http/Admin/Request/Permission/BatchGrantDataPermissionForPositionRequest.php
@@ -1,5 +1,15 @@
 <?php
 
+declare(strict_types=1);
+/**
+ * This file is part of MineAdmin.
+ *
+ * @link     https://www.mineadmin.com
+ * @document https://doc.mineadmin.com
+ * @contact  root@imoi.cn
+ * @license  https://github.com/mineadmin/MineAdmin/blob/master/LICENSE
+ */
+
 namespace App\Http\Admin\Request\Permission;
 
 use App\Http\Common\Request\Traits\NoAuthorizeTrait;
@@ -24,11 +34,6 @@ public function rules(): array
                 'array',
                 'min:1',
             ],
-            'is_default' => [
-                'sometimes',
-                'integer',
-                'in:0,1',
-            ],
         ];
     }
 
@@ -37,7 +42,6 @@ public function attributes(): array
         return [
             'policy_type' => '策略类型',
             'value' => '策略值',
-            'is_default' => '是否默认策略',
         ];
     }
-}
\ No newline at end of file
+}
diff --git a/app/Http/Admin/Request/Permission/LeaderRequest.php b/app/Http/Admin/Request/Permission/LeaderRequest.php
index f401c594b..d59dcc3ac 100644
--- a/app/Http/Admin/Request/Permission/LeaderRequest.php
+++ b/app/Http/Admin/Request/Permission/LeaderRequest.php
@@ -20,7 +20,7 @@
 #[\Mine\Swagger\Attributes\FormRequest(
     schema: LeaderSchema::class,
     only: [
-        'dept_id', 'user_id'
+        'dept_id', 'user_id',
     ]
 )]
 class LeaderRequest extends FormRequest
diff --git a/app/Http/Admin/Request/Permission/RoleRequest.php b/app/Http/Admin/Request/Permission/RoleRequest.php
index 1879f3534..4f51226f3 100644
--- a/app/Http/Admin/Request/Permission/RoleRequest.php
+++ b/app/Http/Admin/Request/Permission/RoleRequest.php
@@ -14,10 +14,8 @@
 
 use App\Http\Common\Request\Traits\HttpMethodTrait;
 use App\Http\Common\Request\Traits\NoAuthorizeTrait;
-use App\Model\Enums\DataPermission\PolicyType;
 use App\Schema\RoleSchema;
 use Hyperf\Validation\Request\FormRequest;
-use Hyperf\Validation\Rule;
 
 #[\Mine\Swagger\Attributes\FormRequest(
     schema: RoleSchema::class,
@@ -42,7 +40,7 @@ public function rules(): array
             ],
             'status' => 'sometimes|integer|in:1,2',
             'sort' => 'required|integer',
-            'remark' => 'nullable|string|max:255'
+            'remark' => 'nullable|string|max:255',
         ];
         if ($this->isCreate()) {
             $rules['code'][] = 'unique:role,code';
diff --git a/app/Http/Admin/Request/Permission/UserRequest.php b/app/Http/Admin/Request/Permission/UserRequest.php
index 7afc4f19e..eb9d53be1 100644
--- a/app/Http/Admin/Request/Permission/UserRequest.php
+++ b/app/Http/Admin/Request/Permission/UserRequest.php
@@ -78,17 +78,15 @@ public function rules(): array
             'department' => [
                 'sometimes',
                 'array',
-                'min:1',
             ],
             'department.*' => [
-                'sometimes',
+                'required_with:department',
                 'integer',
                 'exists:department,id',
             ],
             'position' => [
                 'sometimes',
                 'array',
-                'min:1',
             ],
             'position.*' => [
                 'sometimes',
@@ -112,6 +110,7 @@ public function attributes(): array
             'backend_setting' => trans('user.backend_setting'),
             'created_by' => trans('user.created_by'),
             'remark' => trans('user.remark'),
+            'department' => trans('user.department'),
         ];
     }
 }
diff --git a/app/Model/DataPermission/Policy.php b/app/Model/DataPermission/Policy.php
index c4ad45d40..040ea005b 100644
--- a/app/Model/DataPermission/Policy.php
+++ b/app/Model/DataPermission/Policy.php
@@ -24,15 +24,15 @@
 /**
  * @property int $id
  * @property int $user_id 用户ID（与角色二选一）
- * @property int $position_id 角色ID（与用户二选一）
+ * @property int $position_id 岗位ID（与用户二选一）
  * @property PolicyType $policy_type 策略类型（DEPT_SELF, DEPT_TREE, ALL, SELF, CUSTOM_DEPT, CUSTOM_FUNC）
  * @property bool $is_default 是否默认策略（默认值：true）
  * @property array $value 策略值
  * @property Carbon $created_at
  * @property Carbon $updated_at
  * @property Carbon $deleted_at
- * @property Position[]|Collection<int,Position> $positions
- * @property User[]|Collection<int,User> $users
+ * @property Collection<int,Position>|Position[] $positions
+ * @property Collection<int,User>|User[] $users
  */
 class Policy extends Model
 {
@@ -67,5 +67,4 @@ public function users(): BelongsToMany
     {
         return $this->belongsToMany(User::class, 'data_permission_policy_user', 'policy_id', 'user_id');
     }
-
 }
diff --git a/app/Model/Permission/Leader.php b/app/Model/Permission/Leader.php
index 281c49bde..57e566722 100644
--- a/app/Model/Permission/Leader.php
+++ b/app/Model/Permission/Leader.php
@@ -12,11 +12,8 @@
 
 namespace App\Model\Permission;
 
-use App\Model\DataPermission\Policy;
 use Carbon\Carbon;
-use Hyperf\Database\Model\Collection;
 use Hyperf\Database\Model\Relations\BelongsTo;
-use Hyperf\Database\Model\Relations\BelongsToMany;
 use Hyperf\Database\Model\SoftDeletes;
 use Hyperf\DbConnection\Model\Model;
 
diff --git a/app/Model/Permission/Position.php b/app/Model/Permission/Position.php
index 76db16c73..3fcf3f415 100644
--- a/app/Model/Permission/Position.php
+++ b/app/Model/Permission/Position.php
@@ -17,6 +17,7 @@
 use Hyperf\Database\Model\Collection;
 use Hyperf\Database\Model\Relations\BelongsTo;
 use Hyperf\Database\Model\Relations\BelongsToMany;
+use Hyperf\Database\Model\Relations\HasOne;
 use Hyperf\Database\Model\SoftDeletes;
 use Hyperf\DbConnection\Model\Model;
 
@@ -60,8 +61,8 @@ public function users(): BelongsToMany
         return $this->belongsToMany(User::class, 'user_position', 'position_id', 'user_id');
     }
 
-    public function policy(): BelongsTo
+    public function policy(): HasOne
     {
-        return $this->belongsTo(Policy::class, 'id', 'id');
+        return $this->hasOne(Policy::class, 'position_id', 'id');
     }
 }
diff --git a/app/Model/Permission/Role.php b/app/Model/Permission/Role.php
index 40fb10f4f..8a9762d32 100644
--- a/app/Model/Permission/Role.php
+++ b/app/Model/Permission/Role.php
@@ -90,5 +90,4 @@ public function deleting(Deleting $event)
         $this->users()->detach();
         $this->menus()->detach();
     }
-
 }
diff --git a/app/Repository/Permission/DepartmentRepository.php b/app/Repository/Permission/DepartmentRepository.php
index 31c39289c..b04c5c773 100644
--- a/app/Repository/Permission/DepartmentRepository.php
+++ b/app/Repository/Permission/DepartmentRepository.php
@@ -50,7 +50,7 @@ public function handleSearch(Builder $query, array $params): Builder
             ->when(isset($params['updated_at']), static function (Builder $query) use ($params) {
                 $query->whereBetween('updated_at', $params['updated_at']);
             })
-            ->when(!empty($params['append_position']), static function (Builder $query) {
+            ->when(! empty($params['append_position']), static function (Builder $query) {
                 $query->with('positions:id,name');
             })
             ->when(isset($params['level']), static function (Builder $query) use ($params) {
diff --git a/app/Repository/Permission/LeaderRepository.php b/app/Repository/Permission/LeaderRepository.php
index f5511f893..bb409e256 100644
--- a/app/Repository/Permission/LeaderRepository.php
+++ b/app/Repository/Permission/LeaderRepository.php
@@ -27,24 +27,18 @@ public function __construct(
 
     public function create(array $data): mixed
     {
-        foreach($data['user_id'] as $id) {
+        foreach ($data['user_id'] as $id) {
             Leader::query()->where('dept_id', $data['dept_id'])->where('user_id', $id)->forceDelete();
             Leader::create(['dept_id' => $data['dept_id'], 'user_id' => $id, 'created_at' => date('Y-m-d H:i:s')]);
         }
         return true;
     }
 
-    protected function enablePageOrderBy(): bool
-    {
-        return false;
-    }
-
     public function deleteByDoubleKey(int $dept_id, array $user_ids): void
     {
         Leader::query()->where('dept_id', $dept_id)->whereIn('user_id', $user_ids)->forceDelete();
     }
 
-
     public function handleSearch(Builder $query, array $params): Builder
     {
         return $query
@@ -60,6 +54,11 @@ public function handleSearch(Builder $query, array $params): Builder
             ->when(isset($params['updated_at']), static function (Builder $query) use ($params) {
                 $query->whereBetween('updated_at', $params['updated_at']);
             })
-            ->with(['department','user']);
+            ->with(['department', 'user']);
+    }
+
+    protected function enablePageOrderBy(): bool
+    {
+        return false;
     }
 }
diff --git a/app/Repository/Permission/PositionRepository.php b/app/Repository/Permission/PositionRepository.php
index b8c5d216a..bee3ad160 100644
--- a/app/Repository/Permission/PositionRepository.php
+++ b/app/Repository/Permission/PositionRepository.php
@@ -40,6 +40,6 @@ public function handleSearch(Builder $query, array $params): Builder
             ->when(isset($params['updated_at']), static function (Builder $query) use ($params) {
                 $query->whereBetween('updated_at', $params['updated_at']);
             })
-            ->with(['department','policy']);
+            ->with(['department', 'policy']);
     }
 }
diff --git a/app/Service/Permission/PositionService.php b/app/Service/Permission/PositionService.php
index 5fb50168d..c53c3f419 100644
--- a/app/Service/Permission/PositionService.php
+++ b/app/Service/Permission/PositionService.php
@@ -33,6 +33,11 @@ public function batchDataPermission(int $id, array $policy): void
         if ($entity === null) {
             throw new BusinessException(ResultCode::NOT_FOUND);
         }
-        $entity->policy()->updateOrCreate([], $policy);
+        $policyEntity = $entity->policy()->first();
+        if (empty($policyEntity)) {
+            $entity->policy()->create($policy);
+        } else {
+            $policyEntity->update($policy);
+        }
     }
 }
diff --git a/app/Service/Permission/RoleService.php b/app/Service/Permission/RoleService.php
index 30cfb5c4c..fc92da29c 100644
--- a/app/Service/Permission/RoleService.php
+++ b/app/Service/Permission/RoleService.php
@@ -12,14 +12,11 @@
 
 namespace App\Service\Permission;
 
-use App\Exception\BusinessException;
-use App\Http\Common\ResultCode;
 use App\Model\Permission\Role;
 use App\Repository\Permission\MenuRepository;
 use App\Repository\Permission\RoleRepository;
 use App\Service\IService;
 use Hyperf\Collection\Collection;
-use Hyperf\DbConnection\Db;
 
 /**
  * @extends IService<Role>
diff --git a/app/Service/Permission/UserService.php b/app/Service/Permission/UserService.php
index 88453d07c..bcb127606 100644
--- a/app/Service/Permission/UserService.php
+++ b/app/Service/Permission/UserService.php
@@ -71,9 +71,6 @@ public function create(array $data): mixed
         return Db::transaction(function () use ($data) {
             /** @var User $entity */
             $entity = parent::create($data);
-            if (! empty($data['policy'])) {
-                $entity->policy()->create($data['policy']);
-            }
             $this->handleWith($entity, $data);
         });
     }
@@ -87,9 +84,6 @@ public function updateById(mixed $id, array $data): mixed
                 throw new BusinessException(ResultCode::NOT_FOUND);
             }
             $entity->fill($data)->save();
-            if (! empty($data['policy'])) {
-                $entity->policy()->update($data['policy']);
-            }
             $this->handleWith($entity, $data);
         });
     }
@@ -102,5 +96,13 @@ protected function handleWith(User $entity, array $data): void
         if (! empty($data['position'])) {
             $entity->position()->sync($data['position']);
         }
+        if (! empty($data['policy'])) {
+            $policy = $entity->policy()->first();
+            if ($policy) {
+                $policy->fill($data['policy'])->save();
+            } else {
+                $entity->policy()->create($data['policy']);
+            }
+        }
     }
 }
diff --git a/storage/languages/zh_CN/user.php b/storage/languages/zh_CN/user.php
index 714f237bd..23eab4ac2 100644
--- a/storage/languages/zh_CN/user.php
+++ b/storage/languages/zh_CN/user.php
@@ -44,4 +44,5 @@
     'old_password_error' => '旧密码错误',
     'old_password' => '旧密码',
     'password_confirmation' => '确认密码',
+    'department' => '部门',
 ];
diff --git a/web/src/modules/base/views/permission/department/position.vue b/web/src/modules/base/views/permission/department/position.vue
index 870ffcc9f..9fdd9754f 100644
--- a/web/src/modules/base/views/permission/department/position.vue
+++ b/web/src/modules/base/views/permission/department/position.vue
@@ -64,8 +64,6 @@ const maDialog: UseDialogExpose = useDialog({
               res.code === ResultCode.SUCCESS ? msg.success(t('crud.createSuccess')) : msg.error(res.message)
               maDialog.close()
               proTableRef.value?.refresh()
-            }).catch((err: any) => {
-              msg.alertError(err)
             })
             break
           // 修改
@@ -74,8 +72,6 @@ const maDialog: UseDialogExpose = useDialog({
               res.code === 200 ? msg.success(t('crud.updateSuccess')) : msg.error(res.message)
               maDialog.close()
               proTableRef.value?.refresh()
-            }).catch((err: any) => {
-              msg.alertError(err)
             })
             break
         }
diff --git a/web/src/modules/base/views/permission/user/data/getFormItems.tsx b/web/src/modules/base/views/permission/user/data/getFormItems.tsx
index 7ed4f483b..f8134f8dd 100644
--- a/web/src/modules/base/views/permission/user/data/getFormItems.tsx
+++ b/web/src/modules/base/views/permission/user/data/getFormItems.tsx
@@ -159,7 +159,7 @@ export default function getFormItems(
         props: { label: 'name', children: 'positions' },
         checkStrictly: true,
         nodeKey: 'id',
-        placeholder: t('form.pleaseInput', { msg: t('baseUserManage.dept') }),
+        placeholder: t('form.pleaseInput', { msg: t('baseUserManage.post') }),
       },
     },
     {
diff --git a/web/src/modules/base/views/permission/user/form.vue b/web/src/modules/base/views/permission/user/form.vue
index 154a5e763..c8550f197 100644
--- a/web/src/modules/base/views/permission/user/form.vue
+++ b/web/src/modules/base/views/permission/user/form.vue
@@ -61,8 +61,6 @@ function add(): Promise<any> {
   return new Promise((resolve, reject) => {
     create(userModel.value).then((res: any) => {
       res.code === ResultCode.SUCCESS ? resolve(res) : reject(res)
-    }).catch((err) => {
-      reject(err)
     })
   })
 }
@@ -75,8 +73,6 @@ function edit(): Promise<any> {
     }
     save(userModel.value.id as number, userModel.value).then((res: any) => {
       res.code === ResultCode.SUCCESS ? resolve(res) : reject(res)
-    }).catch((err) => {
-      reject(err)
     })
   })
 }

From 4a6251284bd028a7448c5f3c628b9a93b7b9fe74 Mon Sep 17 00:00:00 2001
From: zds <49744633+zds-s@users.noreply.github.com>
Date: Sat, 24 May 2025 13:41:02 +0800
Subject: [PATCH 61/91] =?UTF-8?q?feat(data-permission):=20=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90=E5=A4=84=E7=90=86?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 新增仅限特定表的数据权限功能
- 重构数据权限处理流程，提高灵活性和可维护性
-优化数据权限查询条件，提升查询性能
- 调整用户权限获取逻辑，支持多岗位权限
---
 app/Http/CurrentUser.php                      | 13 ++++++++-
 .../Aspects/DataScopeAspect.php               | 23 +++++++++++++---
 .../DataPermission/Attribute/DataScope.php    |  6 +++++
 app/Library/DataPermission/Context.php        | 12 +++++++++
 app/Library/DataPermission/Factory.php        | 27 ++++++++++++-------
 .../Rule/Executable/CreatedByIdsExecute.php   | 27 +++++++++++--------
 app/Model/Permission/User.php                 |  8 +++---
 app/Service/Permission/UserService.php        | 11 ++++++++
 8 files changed, 97 insertions(+), 30 deletions(-)

diff --git a/app/Http/CurrentUser.php b/app/Http/CurrentUser.php
index d5a37aebf..a09647af9 100644
--- a/app/Http/CurrentUser.php
+++ b/app/Http/CurrentUser.php
@@ -18,6 +18,7 @@
 use App\Service\Permission\UserService;
 use Hyperf\Collection\Arr;
 use Hyperf\Collection\Collection;
+use Hyperf\Context\Context;
 use Lcobucci\JWT\Token\RegisteredClaims;
 use Mine\Jwt\Traits\RequestScopedTokenTrait;
 
@@ -30,9 +31,19 @@ public function __construct(
         private readonly UserService $userService
     ) {}
 
+    public static function ctxUser(): ?User
+    {
+        return Context::get('current_user');
+    }
+
     public function user(): ?User
     {
-        return $this->userService->getInfo($this->id());
+        if (Context::has('current_user')) {
+            return Context::get('current_user');
+        }
+        $user = $this->userService->getInfo($this->id());
+        Context::set('current_user', $user);
+        return $user;
     }
 
     public function refresh(): array
diff --git a/app/Library/DataPermission/Aspects/DataScopeAspect.php b/app/Library/DataPermission/Aspects/DataScopeAspect.php
index 998b01ed1..4bcd8fe57 100644
--- a/app/Library/DataPermission/Aspects/DataScopeAspect.php
+++ b/app/Library/DataPermission/Aspects/DataScopeAspect.php
@@ -12,8 +12,10 @@
 
 namespace App\Library\DataPermission\Aspects;
 
+use App\Http\CurrentUser;
 use App\Library\DataPermission\Attribute\DataScope;
 use App\Library\DataPermission\Context as DataPermissionContext;
+use App\Library\DataPermission\Factory;
 use Hyperf\Context\Context;
 use Hyperf\Database\Query\Builder;
 use Hyperf\Di\Annotation\Aspect;
@@ -35,6 +37,10 @@ final class DataScopeAspect extends AbstractAspect
         Builder::class . '::runSelect',
     ];
 
+    public function __construct(
+        private readonly Factory $factory
+    ) {}
+
     public function process(ProceedingJoinPoint $proceedingJoinPoint)
     {
         if (
@@ -74,8 +80,16 @@ protected function handleSelect(ProceedingJoinPoint $proceedingJoinPoint)
          * @var Builder $builder
          */
         $builder = $proceedingJoinPoint->getInstance();
-        if (Context::has(self::CONTEXT_KEY)) {
-            // todo 做数据权限处理
+        if (! \in_array($builder->from, DataPermissionContext::getOnlyTables() ?: [], true)) {
+            return $proceedingJoinPoint->process();
+        }
+        if (Context::has(self::CONTEXT_KEY) && $user = CurrentUser::ctxUser()) {
+            Context::destroy(self::CONTEXT_KEY);
+            $this->factory->build(
+                $builder,
+                $user
+            );
+            Context::set(self::CONTEXT_KEY, 1);
         }
         return $proceedingJoinPoint->process();
     }
@@ -86,13 +100,14 @@ protected function handleDataScope(ProceedingJoinPoint $proceedingJoinPoint)
         /**
          * @var DataScope $attribute
          */
-        $attribute = $proceedingJoinPoint->getAnnotationMetadata()->class[DataScope::class];
+        $attribute = $proceedingJoinPoint->getAnnotationMetadata()->class[DataScope::class] ?? null;
         if ($attribute === null) {
-            $attribute = $proceedingJoinPoint->getAnnotationMetadata()->method[DataScope::class];
+            $attribute = $proceedingJoinPoint->getAnnotationMetadata()->method[DataScope::class] ?? null;
         }
         DataPermissionContext::setDeptColumn($attribute->getDeptColumn());
         DataPermissionContext::setCreatedByColumn($attribute->getCreatedByColumn());
         DataPermissionContext::setScopeType($attribute->getScopeType());
+        DataPermissionContext::setOnlyTables($attribute->getOnlyTables());
         $result = $proceedingJoinPoint->process();
         Context::destroy(self::CONTEXT_KEY);
         return $result;
diff --git a/app/Library/DataPermission/Attribute/DataScope.php b/app/Library/DataPermission/Attribute/DataScope.php
index 9d239677d..498a48684 100644
--- a/app/Library/DataPermission/Attribute/DataScope.php
+++ b/app/Library/DataPermission/Attribute/DataScope.php
@@ -22,8 +22,14 @@ public function __construct(
         private readonly string $deptColumn = 'dept_id',
         private readonly string $createdByColumn = 'created_by',
         private readonly ScopeType $scopeType = ScopeType::DEPT_CREATED_BY,
+        private readonly ?array $onlyTables = null
     ) {}
 
+    public function getOnlyTables(): ?array
+    {
+        return $this->onlyTables;
+    }
+
     public function getDeptColumn(): string
     {
         return $this->deptColumn;
diff --git a/app/Library/DataPermission/Context.php b/app/Library/DataPermission/Context.php
index 955bcf5e2..1ef3be8fc 100644
--- a/app/Library/DataPermission/Context.php
+++ b/app/Library/DataPermission/Context.php
@@ -22,6 +22,18 @@ final class Context
 
     private const SCOPE_TYPE_KEY = 'data_permission_scope_type';
 
+    private const ONLY_TABLES_KEY = 'data_permission_only_tables';
+
+    public static function setOnlyTables(array $tables): void
+    {
+        Ctx::set(self::ONLY_TABLES_KEY, $tables);
+    }
+
+    public static function getOnlyTables(): array
+    {
+        return Ctx::get(self::ONLY_TABLES_KEY, []);
+    }
+
     public static function getDeptColumn(): string
     {
         return Ctx::get(self::DEPT_COLUMN_KEY, 'dept_id');
diff --git a/app/Library/DataPermission/Factory.php b/app/Library/DataPermission/Factory.php
index 24e85ad3b..a480c2341 100644
--- a/app/Library/DataPermission/Factory.php
+++ b/app/Library/DataPermission/Factory.php
@@ -52,22 +52,25 @@ public function build(
 
     private function handleCreatedBy(User $user, Policy $policy, Builder $builder): void
     {
-        $createdByList = $this->rule->getCreatedByList($user, $policy);
-        $builder->whereIn(Context::getCreatedByColumn(), $createdByList);
+        $builder->when($this->rule->getCreatedByList($user, $policy), static function (Builder $query, array $createdByList) {
+            $query->whereIn(Context::getCreatedByColumn(), $createdByList);
+        });
     }
 
     private function handleDept(User $user, Policy $policy, Builder $builder): void
     {
-        $deptList = $this->rule->getDeptIds($user, $policy);
-        $builder->whereIn(Context::getDeptColumn(), $deptList);
+        $builder->when($this->rule->getDeptIds($user, $policy), static function (Builder $query, array $deptList) {
+            $query->whereIn(Context::getDeptColumn(), $deptList);
+        });
     }
 
     private function handleDeptCreatedBy(User $user, Policy $policy, Builder $builder): void
     {
-        $createdByList = $this->rule->getCreatedByList($user, $policy);
-        $deptList = $this->rule->getDeptIds($user, $policy);
-        $builder->whereIn(Context::getCreatedByColumn(), $createdByList)
-            ->whereIn(Context::getDeptColumn(), $deptList);
+        $builder->when($this->rule->getDeptIds($user, $policy), static function (Builder $query, array $deptList) {
+            $query->whereIn(Context::getDeptColumn(), $deptList);
+        })->when($this->rule->getCreatedByList($user, $policy), static function (Builder $query, array $createdByList) {
+            $query->whereIn(Context::getCreatedByColumn(), $createdByList);
+        });
     }
 
     private function handleDeptOrCreatedBy(User $user, Policy $policy, Builder $builder): void
@@ -75,8 +78,12 @@ private function handleDeptOrCreatedBy(User $user, Policy $policy, Builder $buil
         $createdByList = $this->rule->getCreatedByList($user, $policy);
         $deptList = $this->rule->getDeptIds($user, $policy);
         $builder->where(static function (Builder $query) use ($createdByList, $deptList) {
-            $query->whereIn(Context::getCreatedByColumn(), $createdByList)
-                ->orWhereIn(Context::getDeptColumn(), $deptList);
+            if ($createdByList) {
+                $query->whereIn(Context::getCreatedByColumn(), $createdByList);
+            }
+            if ($deptList) {
+                $query->orWhereIn(Context::getDeptColumn(), $deptList);
+            }
         });
     }
 }
diff --git a/app/Library/DataPermission/Rule/Executable/CreatedByIdsExecute.php b/app/Library/DataPermission/Rule/Executable/CreatedByIdsExecute.php
index aca5b779a..43c17860a 100644
--- a/app/Library/DataPermission/Rule/Executable/CreatedByIdsExecute.php
+++ b/app/Library/DataPermission/Rule/Executable/CreatedByIdsExecute.php
@@ -52,16 +52,21 @@ public function execute(): ?array
         $ids = [
             $this->getUser()->id,
         ];
-        foreach ($departmentList as $department) {
-            if ($policyType->isSelf()) {
-                break;
+        if ($policyType->isSelf()) {
+            return $ids;
+        }
+        if (! empty($departmentList)) {
+            foreach ($departmentList as $department) {
+                if ($policyType->isSelf()) {
+                    break;
+                }
+                $this->getUser()->newQuery()
+                    ->whereHas('department', static function ($query) use ($department) {
+                        $query->whereIn('id', $department->id);
+                    })->get()->each(static function (User $user) use (&$ids) {
+                        $ids[] = $user->id;
+                    });
             }
-            $this->getUser()->newQuery()
-                ->whereHas('department', static function ($query) use ($department) {
-                    $query->whereIn('id', $department->id);
-                })->get()->each(static function (User $user) use (&$ids) {
-                    $ids[] = $user->id;
-                });
         }
         if ($policyType->isNotCustomFunc() && $policyType->isNotCustomDept()) {
             /**
@@ -69,10 +74,10 @@ public function execute(): ?array
              */
             $leaderDepartmentList = $this->getUser()->department()->get();
             foreach ($leaderDepartmentList as $department) {
-                if ($policyType->isSelf() || $policyType->isDeptSelf()) {
+                if ($policyType->isDeptSelf()) {
                     $this->getUser()->newQuery()
                         ->whereHas('department', static function ($query) use ($department) {
-                            $query->whereIn('id', $department->id);
+                            $query->where('id', $department->id);
                         })->get()->each(static function (User $user) use (&$ids) {
                             $ids[] = $user->id;
                         });
diff --git a/app/Model/Permission/User.php b/app/Model/Permission/User.php
index 4cb9106b7..43634731b 100644
--- a/app/Model/Permission/User.php
+++ b/app/Model/Permission/User.php
@@ -174,10 +174,10 @@ public function getPolicy(): ?Policy
             return $policy;
         }
 
-        $this->load('roles');
-        $roleList = $this->roles;
-        foreach ($roleList as $role) {
-            $current = $role->policy()->first();
+        $this->load('position');
+        $positionList = $this->position;
+        foreach ($positionList as $position) {
+            $current = $position->policy()->first();
             if (! empty($current)) {
                 return $current;
             }
diff --git a/app/Service/Permission/UserService.php b/app/Service/Permission/UserService.php
index bcb127606..18d2e6a76 100644
--- a/app/Service/Permission/UserService.php
+++ b/app/Service/Permission/UserService.php
@@ -14,6 +14,8 @@
 
 use App\Exception\BusinessException;
 use App\Http\Common\ResultCode;
+use App\Library\DataPermission\Attribute\DataScope;
+use App\Library\DataPermission\ScopeType;
 use App\Model\Permission\Role;
 use App\Model\Permission\User;
 use App\Repository\Permission\RoleRepository;
@@ -88,6 +90,15 @@ public function updateById(mixed $id, array $data): mixed
         });
     }
 
+    #[DataScope(
+        scopeType: ScopeType::CREATED_BY,
+        onlyTables: ['user']
+    )]
+    public function page(array $params, int $page = 1, int $pageSize = 10): array
+    {
+        return parent::page($params, $page, $pageSize); // TODO: Change the autogenerated stub
+    }
+
     protected function handleWith(User $entity, array $data): void
     {
         if (! empty($data['department'])) {

From c9f41c533f46c5a3abe05314f61e12820e6886d6 Mon Sep 17 00:00:00 2001
From: zds <49744633+zds-s@users.noreply.github.com>
Date: Sat, 24 May 2025 14:42:41 +0800
Subject: [PATCH 62/91] =?UTF-8?q?feat(DataPermission):=20=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90=E5=85=A8=E5=B1=80?=
 =?UTF-8?q?=E4=BD=9C=E7=94=A8=E5=9F=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 新增 DataScope 类实现 Hyperf\Database\Model\Scope 接口
- 创建 DataScopes trait 用于在模型中应用数据权限作用域
---
 .../DataPermission/Scope/DataScope.php        | 38 +++++++++++++++++++
 .../DataPermission/Scope/DataScopes.php       | 26 +++++++++++++
 2 files changed, 64 insertions(+)
 create mode 100644 app/Library/DataPermission/Scope/DataScope.php
 create mode 100644 app/Library/DataPermission/Scope/DataScopes.php

diff --git a/app/Library/DataPermission/Scope/DataScope.php b/app/Library/DataPermission/Scope/DataScope.php
new file mode 100644
index 000000000..cac66297f
--- /dev/null
+++ b/app/Library/DataPermission/Scope/DataScope.php
@@ -0,0 +1,38 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * This file is part of MineAdmin.
+ *
+ * @link     https://www.mineadmin.com
+ * @document https://doc.mineadmin.com
+ * @contact  root@imoi.cn
+ * @license  https://github.com/mineadmin/MineAdmin/blob/master/LICENSE
+ */
+
+namespace App\Library\DataPermission\Scope;
+
+use App\Http\CurrentUser;
+use App\Library\DataPermission\Factory;
+use Hyperf\Database\Model\Builder;
+use Hyperf\Database\Model\Model;
+use Hyperf\Database\Model\Scope;
+
+class DataScope implements Scope
+{
+    protected array $extensions = [];
+
+    public function __construct(
+        private readonly Factory $factory
+    ) {}
+
+    public function apply(Builder $builder, Model $model): void
+    {
+        $user = CurrentUser::ctxUser();
+        if (empty($user)) {
+            return;
+        }
+
+        $this->factory->build($builder->getQuery(), $user);
+    }
+}
diff --git a/app/Library/DataPermission/Scope/DataScopes.php b/app/Library/DataPermission/Scope/DataScopes.php
new file mode 100644
index 000000000..1599feedc
--- /dev/null
+++ b/app/Library/DataPermission/Scope/DataScopes.php
@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * This file is part of MineAdmin.
+ *
+ * @link     https://www.mineadmin.com
+ * @document https://doc.mineadmin.com
+ * @contact  root@imoi.cn
+ * @license  https://github.com/mineadmin/MineAdmin/blob/master/LICENSE
+ */
+
+namespace App\Library\DataPermission\Scope;
+
+use Hyperf\DbConnection\Model\Model;
+
+/**
+ * @mixin Model
+ */
+trait DataScopes
+{
+    public static function bootDataScopes(): void
+    {
+        static::addGlobalScope(DataScope::class);
+    }
+}

From 64e85eaac0a96084fc881518c4c0b8e4632c1707 Mon Sep 17 00:00:00 2001
From: zds <49744633+zds-s@users.noreply.github.com>
Date: Sat, 24 May 2025 17:32:35 +0800
Subject: [PATCH 63/91] =?UTF-8?q?feat(data-permission):=20=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E8=87=AA=E5=AE=9A=E4=B9=89=E6=95=B0=E6=8D=AE=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 新增自定义数据权限配置文件 custom.php- 实现自定义数据权限加载逻辑
- 添加测试用自定义数据权限规则
- 优化数据权限工厂类，支持自定义规则
---
 app/Library/DataPermission/Factory.php        |  8 +++
 .../Rule/Executable/CreatedByIdsExecute.php   |  6 ---
 app/Library/DataPermission/Rule/Rule.php      | 11 ++++
 config/autoload/department/cache.php          | 27 ++++++----
 config/autoload/department/custom.php         | 54 +++++++++++++++++++
 5 files changed, 91 insertions(+), 15 deletions(-)
 create mode 100644 config/autoload/department/custom.php

diff --git a/app/Library/DataPermission/Factory.php b/app/Library/DataPermission/Factory.php
index a480c2341..de3fdc84a 100644
--- a/app/Library/DataPermission/Factory.php
+++ b/app/Library/DataPermission/Factory.php
@@ -14,6 +14,7 @@
 
 use App\Library\DataPermission\Rule\Rule;
 use App\Model\DataPermission\Policy;
+use App\Model\Enums\DataPermission\PolicyType;
 use App\Model\Permission\User;
 use Hyperf\Database\Query\Builder;
 
@@ -34,6 +35,13 @@ public function build(
             return;
         }
         $scopeType = Context::getScopeType();
+        if ($policy->policy_type === PolicyType::CustomFunc) {
+            $customFunc = $policy->value[0] ?? null;
+            if (! \is_string($customFunc)) {
+                throw new \RuntimeException(\sprintf('Invalid custom function: %s', $customFunc));
+            }
+            $this->rule->loadCustomFunc($customFunc, $builder, $user, $policy, $scopeType);
+        }
         switch ($scopeType) {
             case ScopeType::CREATED_BY:
                 self::handleCreatedBy($user, $policy, $builder);
diff --git a/app/Library/DataPermission/Rule/Executable/CreatedByIdsExecute.php b/app/Library/DataPermission/Rule/Executable/CreatedByIdsExecute.php
index 43c17860a..a60dcf814 100644
--- a/app/Library/DataPermission/Rule/Executable/CreatedByIdsExecute.php
+++ b/app/Library/DataPermission/Rule/Executable/CreatedByIdsExecute.php
@@ -57,9 +57,6 @@ public function execute(): ?array
         }
         if (! empty($departmentList)) {
             foreach ($departmentList as $department) {
-                if ($policyType->isSelf()) {
-                    break;
-                }
                 $this->getUser()->newQuery()
                     ->whereHas('department', static function ($query) use ($department) {
                         $query->whereIn('id', $department->id);
@@ -98,9 +95,6 @@ public function execute(): ?array
              */
             $positionList = $this->getUser()->position()->get();
             foreach ($positionList as $position) {
-                if ($policyType->isSelf()) {
-                    break;
-                }
                 if ($policyType->isDeptSelf()) {
                     $position->department()->get()->each(function (Department $department) use (&$ids) {
                         $this->getUser()->newQuery()
diff --git a/app/Library/DataPermission/Rule/Rule.php b/app/Library/DataPermission/Rule/Rule.php
index e4f7540da..d8270e9ba 100644
--- a/app/Library/DataPermission/Rule/Rule.php
+++ b/app/Library/DataPermission/Rule/Rule.php
@@ -14,10 +14,12 @@
 
 use App\Library\DataPermission\Rule\Executable\CreatedByIdsExecute;
 use App\Library\DataPermission\Rule\Executable\DeptExecute;
+use App\Library\DataPermission\ScopeType;
 use App\Model\DataPermission\Policy;
 use App\Model\Permission\User;
 use Hyperf\Cache\CacheManager;
 use Hyperf\Contract\ConfigInterface;
+use Hyperf\Database\Query\Builder;
 use Psr\SimpleCache\CacheInterface;
 
 final class Rule
@@ -69,4 +71,13 @@ public function getCreatedByList(User $user, Policy $policy): array
         $this->cache->set($cacheKey, $result, $this->getTtl());
         return $result;
     }
+
+    public function loadCustomFunc(string $customFunc, Builder $builder, User $user, ?Policy $policy, ScopeType $scopeType): void
+    {
+        $func = $this->config->get('department.custom.' . $customFunc);
+        if ($func === null) {
+            throw new \RuntimeException(\sprintf('Custom function %s not found', $customFunc));
+        }
+        $func($builder, $scopeType, $policy, $user);
+    }
 }
diff --git a/config/autoload/department/cache.php b/config/autoload/department/cache.php
index 16abc2b3a..f7b718194 100644
--- a/config/autoload/department/cache.php
+++ b/config/autoload/department/cache.php
@@ -1,21 +1,30 @@
 <?php
 
+declare(strict_types=1);
+/**
+ * This file is part of MineAdmin.
+ *
+ * @link     https://www.mineadmin.com
+ * @document https://doc.mineadmin.com
+ * @contact  root@imoi.cn
+ * @license  https://github.com/mineadmin/MineAdmin/blob/master/LICENSE
+ */
 return [
-    /**
+    /*
      * 每次组装数据权限时，都会重新查询数据库，这样可以保证数据权限的实时性，但是会增加数据库的压力
      * 如果你的数据权限不会频繁变动，可以开启缓存，缓存时间可以根据实际情况设置
      */
-    'enable'    =>  env('DATA_PERMISSION_CACHE_ENABLE',false),
-    /**
+    'enable' => env('DATA_PERMISSION_CACHE_ENABLE', false),
+    /*
      * 缓存时间，单位秒
      */
-    'ttl'       =>  env('DATA_PERMISSION_CACHE_TTL',60 * 5),
-    /**
+    'ttl' => env('DATA_PERMISSION_CACHE_TTL', 60 * 5),
+    /*
      * 缓存前缀
      */
-    'prefix'    =>  env('DATA_PERMISSION_CACHE_PREFIX','data_permission'),
-    /**
+    'prefix' => env('DATA_PERMISSION_CACHE_PREFIX', 'data_permission'),
+    /*
      * 缓存驱动
      */
-    'driver'    =>  env('DATA_PERMISSION_CACHE_DRIVER','default'),
-];
\ No newline at end of file
+    'driver' => env('DATA_PERMISSION_CACHE_DRIVER', 'default'),
+];
diff --git a/config/autoload/department/custom.php b/config/autoload/department/custom.php
new file mode 100644
index 000000000..ca6db8a1c
--- /dev/null
+++ b/config/autoload/department/custom.php
@@ -0,0 +1,54 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * This file is part of MineAdmin.
+ *
+ * @link     https://www.mineadmin.com
+ * @document https://doc.mineadmin.com
+ * @contact  root@imoi.cn
+ * @license  https://github.com/mineadmin/MineAdmin/blob/master/LICENSE
+ */
+
+use App\Library\DataPermission\Context;
+use App\Library\DataPermission\ScopeType;
+use App\Model\DataPermission\Policy;
+use App\Model\Permission\User;
+use Hyperf\Database\Query\Builder;
+
+return [
+    'testction' =>  function (Builder $builder, ScopeType $scopeType, Policy $policy, User $user) {
+        // 只针对 id 为 2 的用户生效
+        if ($user->id !== 2) {
+            return;
+        }
+        // 获取当前上下文中的创建人字段名称
+        $createdByColumn = Context::getCreatedByColumn();
+        // 获取当前上下文中的部门字段名称
+        $deptColumn = Context::getDeptColumn();
+        switch ($scopeType){
+            // 隔离类型为根据创建人
+            case ScopeType::CREATED_BY:
+                // 创建人字段为当前用户
+                $builder->where($createdByColumn, $user->id);
+                break;
+            case ScopeType::DEPT:
+                // 部门字段为当前用户部门
+                $builder->whereIn($deptColumn, $user->department()->get()->pluck('id'));
+                break;
+            case ScopeType::DEPT_CREATED_BY:
+                // 部门字段为当前用户部门
+                $builder->whereIn($deptColumn, $user->department()->get()->pluck('id'));
+                // 创建人为当前用户
+                $builder->where($createdByColumn, $user->id);
+                break;
+            case ScopeType::DEPT_OR_CREATED_BY:
+                // 部门字段为当前用户部门
+                $builder->whereIn($deptColumn, $user->department()->get()->pluck('id'));
+                // 创建人为当前用户
+                $builder->orWhere($createdByColumn, $user->id);
+                break;
+        }
+        return;
+    }
+];

From e753a6db9960e62186142faae1659ce33ff15045 Mon Sep 17 00:00:00 2001
From: westng <57742335+westng@users.noreply.github.com>
Date: Mon, 26 May 2025 11:31:53 +0800
Subject: [PATCH 64/91] =?UTF-8?q?fix(department)=EF=BC=9A=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E9=83=A8=E9=97=A8=E7=AE=A1=E7=90=86=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=20(#612)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../permission/department/data/getTableColumns.tsx  |  2 +-
 .../base/views/permission/department/index.vue      | 13 ++-----------
 .../base/views/permission/department/setLeader.vue  |  2 +-
 3 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/web/src/modules/base/views/permission/department/data/getTableColumns.tsx b/web/src/modules/base/views/permission/department/data/getTableColumns.tsx
index 0e6f64bc7..ea16bc823 100644
--- a/web/src/modules/base/views/permission/department/data/getTableColumns.tsx
+++ b/web/src/modules/base/views/permission/department/data/getTableColumns.tsx
@@ -29,7 +29,7 @@ export default function getTableColumns(dialog: UseDialogExpose, formRef: any, t
     { label: () => t('baseDepartment.name'), prop: 'name', align: 'left' },
     { label: () => t('baseDepartment.leaderCount'), prop: 'leader', cellRender: ({ row }) => row.leader?.length ?? 0 },
     { label: () => t('baseDepartment.positionsCount'), prop: 'positions', cellRender: ({ row }) => row.positions?.length ?? 0 },
-    { label: () => t('baseDepartment.usersCount'), prop: 'users', cellRender: ({ row }) => row.users?.length ?? 0 },
+    { label: () => t('baseDepartment.usersCount'), prop: 'users', cellRender: ({ row }) => row.department_users?.length ?? 0 },
     { label: () => t('baseDepartment.created_at'), prop: 'created_at', width: 200 },
     { label: () => t('baseDepartment.updated_at'), prop: 'updated_at', width: 200 },
 
diff --git a/web/src/modules/base/views/permission/department/index.vue b/web/src/modules/base/views/permission/department/index.vue
index 856920ee1..1a177b836 100644
--- a/web/src/modules/base/views/permission/department/index.vue
+++ b/web/src/modules/base/views/permission/department/index.vue
@@ -77,17 +77,8 @@ const maDialog: UseDialogExpose = useDialog({
       maDialog.close()
     }
     else {
-      const elForm = setFormRef.value.maForm.getElFormRef()
-      // 验证通过后
-      elForm.validate().then(() => {
-        // 设置负责人
-        setFormRef.value.saveUserRole().then((res: any) => {
-          res.code === ResultCode.SUCCESS ? msg.success(t('baseUserManage.setRoleSuccess')) : msg.error(res.message)
-          maDialog.close()
-        }).catch((err: any) => {
-          msg.alertError(err)
-        })
-      })
+      proTableRef.value.refresh()
+      maDialog.close()
     }
     okLoadingState(false)
   },
diff --git a/web/src/modules/base/views/permission/department/setLeader.vue b/web/src/modules/base/views/permission/department/setLeader.vue
index dfcfbcd6c..3b6eaed14 100644
--- a/web/src/modules/base/views/permission/department/setLeader.vue
+++ b/web/src/modules/base/views/permission/department/setLeader.vue
@@ -92,7 +92,7 @@ const options = ref<MaProTableOptions>({
   tableOptions: {
     adaption: false,
     height: 400,
-    rowKey: 'id',
+    rowKey: 'user_id',
     on: {
       // 表格选择事件
       onSelectionChange: (selection: any[]) => selections.value = selection,

From 60e0fac5af4e066fa7f86f23dc51d40ee451a92e Mon Sep 17 00:00:00 2001
From: zds <49744633+zds-s@users.noreply.github.com>
Date: Mon, 26 May 2025 12:21:04 +0800
Subject: [PATCH 65/91] =?UTF-8?q?refactor(Permission):=20=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E9=83=A8=E9=97=A8=E5=92=8C=E6=9C=8D=E5=8A=A1=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E6=9D=83=E9=99=90=E5=A4=84=E7=90=86=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

-将空值检查从 !empty() 改为 isset()，提高代码的可读性和性能
- 在 DepartmentService 和 UserService 中统一处理关联数据的同步
---
 app/Service/Permission/DepartmentService.php | 4 ++--
 app/Service/Permission/UserService.php       | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/Service/Permission/DepartmentService.php b/app/Service/Permission/DepartmentService.php
index b3e97f495..18510e3e2 100644
--- a/app/Service/Permission/DepartmentService.php
+++ b/app/Service/Permission/DepartmentService.php
@@ -59,10 +59,10 @@ public function getPositionsByDepartmentId(int $id): array
 
     protected function handleEntity(Department $entity, array $data): void
     {
-        if (! empty($data['department_users'])) {
+        if (isset($data['department_users'])) {
             $entity->department_users()->sync($data['department_users']);
         }
-        if (! empty($data['leader'])) {
+        if (isset($data['leader'])) {
             $entity->leader()->sync($data['leader']);
         }
     }
diff --git a/app/Service/Permission/UserService.php b/app/Service/Permission/UserService.php
index 18d2e6a76..d35e44930 100644
--- a/app/Service/Permission/UserService.php
+++ b/app/Service/Permission/UserService.php
@@ -101,13 +101,13 @@ public function page(array $params, int $page = 1, int $pageSize = 10): array
 
     protected function handleWith(User $entity, array $data): void
     {
-        if (! empty($data['department'])) {
+        if (isset($data['department'])) {
             $entity->department()->sync($data['department']);
         }
-        if (! empty($data['position'])) {
+        if (isset($data['position'])) {
             $entity->position()->sync($data['position']);
         }
-        if (! empty($data['policy'])) {
+        if (isset($data['policy'])) {
             $policy = $entity->policy()->first();
             if ($policy) {
                 $policy->fill($data['policy'])->save();

From d5f330e345c53feb672ffa3806f66d7a5540884c Mon Sep 17 00:00:00 2001
From: zds <49744633+zds-s@users.noreply.github.com>
Date: Mon, 26 May 2025 12:24:42 +0800
Subject: [PATCH 66/91] =?UTF-8?q?refactor(user):=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=AD=96=E7=95=A5=E6=95=B0=E6=8D=AE=E5=90=8C?=
 =?UTF-8?q?=E6=AD=A5=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将 isset 判断改为 !empty 判断，提高数据有效性验证
- 优化了用户策略数据的同步流程，确保只有在策略数据存在时才进行更新操作
---
 app/Service/Permission/UserService.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Service/Permission/UserService.php b/app/Service/Permission/UserService.php
index d35e44930..1ae862a0e 100644
--- a/app/Service/Permission/UserService.php
+++ b/app/Service/Permission/UserService.php
@@ -107,7 +107,7 @@ protected function handleWith(User $entity, array $data): void
         if (isset($data['position'])) {
             $entity->position()->sync($data['position']);
         }
-        if (isset($data['policy'])) {
+        if (!empty($data['policy'])) {
             $policy = $entity->policy()->first();
             if ($policy) {
                 $policy->fill($data['policy'])->save();

From d0666055d6a1b9bc11f61005ccb622670a2db1c0 Mon Sep 17 00:00:00 2001
From: "X.Mo" <root@imoi.cn>
Date: Mon, 26 May 2025 15:58:36 +0800
Subject: [PATCH 67/91] =?UTF-8?q?refactor(user):=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E9=83=A8=E9=97=A8=E4=B8=8B=E6=8B=89=E6=B8=85?=
 =?UTF-8?q?=E9=99=A4=E5=92=8C=E5=8D=95=E7=82=B9=E5=88=A0=E9=99=A4=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E4=BA=8B=E4=BB=B6=E5=AF=B9=E6=95=B0=E6=8D=AE=E7=9A=84?=
 =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=B8=85=E7=A9=BA=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/permission/user/data/getFormItems.tsx   | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/web/src/modules/base/views/permission/user/data/getFormItems.tsx b/web/src/modules/base/views/permission/user/data/getFormItems.tsx
index f8134f8dd..d1149c05d 100644
--- a/web/src/modules/base/views/permission/user/data/getFormItems.tsx
+++ b/web/src/modules/base/views/permission/user/data/getFormItems.tsx
@@ -143,6 +143,21 @@ export default function getFormItems(
             postList.value.push(post)
           }
         },
+        onRemoveTag: (value: number) => {
+          const current = postList.value.find((item: any) => item.id === value)?.positions ?? []
+          if (current.length > 0) {
+            current?.map((item: any) => {
+              if (model.position?.includes(item.id)) {
+                model.position?.splice(model.position?.indexOf(item.id), 1)
+              }
+            })
+          }
+          postList.value = postList.value.filter((item: any) => item.id !== value)
+        },
+        onClear: () => {
+          postList.value = []
+          model.position = []
+        },
       },
     },
     {

From 7b0e5f3c47f075119ac5b5c6045de253eb0f87c4 Mon Sep 17 00:00:00 2001
From: "X.Mo" <root@imoi.cn>
Date: Mon, 26 May 2025 16:14:20 +0800
Subject: [PATCH 68/91] =?UTF-8?q?fix(icons):=20=E4=BF=AE=E5=A4=8D=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E5=9B=BE=E6=A0=87=E5=91=BD=E4=BB=A4=E6=8A=A5=E7=BC=BA?=
 =?UTF-8?q?=E5=B0=91`inquirer`=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/package.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/web/package.json b/web/package.json
index f1597ff35..73dbae862 100644
--- a/web/package.json
+++ b/web/package.json
@@ -32,6 +32,7 @@
     "echarts": "^5.6.0",
     "element-plus": "^2.9.9",
     "floating-vue": "5.2.2",
+    "inquirer": "^12.6.3",
     "lodash-es": "^4.17.21",
     "md-editor-v3": "^5.3.0",
     "nprogress": "^0.2.0",

From 3217ab0660349bfe407389f7b654ccf9f4fce505 Mon Sep 17 00:00:00 2001
From: zds <49744633+zds-s@users.noreply.github.com>
Date: Tue, 27 May 2025 20:01:14 +0800
Subject: [PATCH 69/91] =?UTF-8?q?style(UserService):=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E7=A9=BA=E5=80=BC=E5=88=A4=E6=96=AD=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 User 实体更新权限策略时，将 !empty() 替换为 ! empty()，增加代码可读性
---
 app/Service/Permission/UserService.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Service/Permission/UserService.php b/app/Service/Permission/UserService.php
index 1ae862a0e..f91cb3c63 100644
--- a/app/Service/Permission/UserService.php
+++ b/app/Service/Permission/UserService.php
@@ -107,7 +107,7 @@ protected function handleWith(User $entity, array $data): void
         if (isset($data['position'])) {
             $entity->position()->sync($data['position']);
         }
-        if (!empty($data['policy'])) {
+        if (! empty($data['policy'])) {
             $policy = $entity->policy()->first();
             if ($policy) {
                 $policy->fill($data['policy'])->save();

From 41484533a179096dbba8d67c1fc0a5236a117e97 Mon Sep 17 00:00:00 2001
From: zds <49744633+zds-s@users.noreply.github.com>
Date: Tue, 27 May 2025 20:19:59 +0800
Subject: [PATCH 70/91] =?UTF-8?q?refactor(data-permission):=20=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90=E7=9B=B8=E5=85=B3?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 添加 phpstan 注释忽略特定代码行的类型检查
- 修复 DataScopeAspect 中的空值判断
- 优化 Department 模型中的 children 关系定义
- 改进 DataScopes trait 的代码结构- 优化数据权限执行规则中的部门和用户查询逻辑
---
 app/Library/DataPermission/Aspects/DataScopeAspect.php |  9 ++++++---
 .../Rule/Executable/CreatedByIdsExecute.php            | 10 ++++++++++
 .../DataPermission/Rule/Executable/DeptExecute.php     |  3 +++
 app/Library/DataPermission/Scope/DataScopes.php        |  1 +
 app/Model/Permission/Department.php                    |  1 +
 app/Repository/Permission/DepartmentRepository.php     |  2 +-
 app/Repository/Permission/LeaderRepository.php         |  3 ++-
 app/Schema/PolicySchema.php                            |  2 +-
 app/Service/Permission/UserService.php                 |  2 +-
 phpstan.neon.dist                                      |  1 +
 10 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/app/Library/DataPermission/Aspects/DataScopeAspect.php b/app/Library/DataPermission/Aspects/DataScopeAspect.php
index 4bcd8fe57..4af4a20f5 100644
--- a/app/Library/DataPermission/Aspects/DataScopeAspect.php
+++ b/app/Library/DataPermission/Aspects/DataScopeAspect.php
@@ -98,11 +98,14 @@ protected function handleDataScope(ProceedingJoinPoint $proceedingJoinPoint)
     {
         Context::set(self::CONTEXT_KEY, 1);
         /**
-         * @var DataScope $attribute
+         * @var null|DataScope $attribute
          */
-        $attribute = $proceedingJoinPoint->getAnnotationMetadata()->class[DataScope::class] ?? null;
+        $attribute = $proceedingJoinPoint->getAnnotationMetadata()->class[DataScope::class] ?: null;
         if ($attribute === null) {
-            $attribute = $proceedingJoinPoint->getAnnotationMetadata()->method[DataScope::class] ?? null;
+            $attribute = $proceedingJoinPoint->getAnnotationMetadata()->method[DataScope::class] ?: null;
+        }
+        if ($attribute === null) {
+            return $proceedingJoinPoint->process();
         }
         DataPermissionContext::setDeptColumn($attribute->getDeptColumn());
         DataPermissionContext::setCreatedByColumn($attribute->getCreatedByColumn());
diff --git a/app/Library/DataPermission/Rule/Executable/CreatedByIdsExecute.php b/app/Library/DataPermission/Rule/Executable/CreatedByIdsExecute.php
index a60dcf814..bb9e9b43e 100644
--- a/app/Library/DataPermission/Rule/Executable/CreatedByIdsExecute.php
+++ b/app/Library/DataPermission/Rule/Executable/CreatedByIdsExecute.php
@@ -57,9 +57,11 @@ public function execute(): ?array
         }
         if (! empty($departmentList)) {
             foreach ($departmentList as $department) {
+                // @phpstan-ignore-next-line
                 $this->getUser()->newQuery()
                     ->whereHas('department', static function ($query) use ($department) {
                         $query->whereIn('id', $department->id);
+                        // @phpstan-ignore-next-line
                     })->get()->each(static function (User $user) use (&$ids) {
                         $ids[] = $user->id;
                     });
@@ -72,18 +74,22 @@ public function execute(): ?array
             $leaderDepartmentList = $this->getUser()->department()->get();
             foreach ($leaderDepartmentList as $department) {
                 if ($policyType->isDeptSelf()) {
+                    // @phpstan-ignore-next-line
                     $this->getUser()->newQuery()
                         ->whereHas('department', static function ($query) use ($department) {
                             $query->where('id', $department->id);
+                            // @phpstan-ignore-next-line
                         })->get()->each(static function (User $user) use (&$ids) {
                             $ids[] = $user->id;
                         });
                 }
                 if ($policyType->isDeptTree()) {
+                    // @phpstan-ignore-next-line
                     $department->getFlatChildren()->each(function (Department $department) use (&$ids) {
                         $this->getUser()->newQuery()
                             ->whereHas('department', static function ($query) use ($department) {
                                 $query->whereIn('id', $department->id);
+                                // @phpstan-ignore-next-line
                             })->get()->each(static function (User $user) use (&$ids) {
                                 $ids[] = $user->id;
                             });
@@ -96,21 +102,25 @@ public function execute(): ?array
             $positionList = $this->getUser()->position()->get();
             foreach ($positionList as $position) {
                 if ($policyType->isDeptSelf()) {
+                    // @phpstan-ignore-next-line
                     $position->department()->get()->each(function (Department $department) use (&$ids) {
                         $this->getUser()->newQuery()
                             ->whereHas('department', static function ($query) use ($department) {
                                 $query->whereIn('id', $department->id);
+                                // @phpstan-ignore-next-line
                             })->get()->each(static function (User $user) use (&$ids) {
                                 $ids[] = $user->id;
                             });
                     });
                 }
                 if ($policyType->isDeptTree()) {
+                    // @phpstan-ignore-next-line
                     $position->department()->get()->each(function (Department $department) use (&$ids) {
                         $department->getFlatChildren()->each(function (Department $department) use (&$ids) {
                             $this->getUser()->newQuery()
                                 ->whereHas('department', static function ($query) use ($department) {
                                     $query->whereIn('id', $department->id);
+                                    // @phpstan-ignore-next-line
                                 })->get()->each(static function (User $user) use (&$ids) {
                                     $ids[] = $user->id;
                                 });
diff --git a/app/Library/DataPermission/Rule/Executable/DeptExecute.php b/app/Library/DataPermission/Rule/Executable/DeptExecute.php
index fa1e7b9ac..787494df2 100644
--- a/app/Library/DataPermission/Rule/Executable/DeptExecute.php
+++ b/app/Library/DataPermission/Rule/Executable/DeptExecute.php
@@ -48,6 +48,9 @@ public function execute(): ?array
                 $departmentList->merge($item->getFlatChildren());
             }
         }
+        if (empty($departmentList)) {
+            return null;
+        }
         $departmentList->merge($this->getUser()->dept_leader()->get());
         /**
          * @var Collection|Position[] $positionList
diff --git a/app/Library/DataPermission/Scope/DataScopes.php b/app/Library/DataPermission/Scope/DataScopes.php
index 1599feedc..6f7af04bb 100644
--- a/app/Library/DataPermission/Scope/DataScopes.php
+++ b/app/Library/DataPermission/Scope/DataScopes.php
@@ -15,6 +15,7 @@
 use Hyperf\DbConnection\Model\Model;
 
 /**
+ * @internal
  * @mixin Model
  */
 trait DataScopes
diff --git a/app/Model/Permission/Department.php b/app/Model/Permission/Department.php
index 2ebef45ef..80635130b 100644
--- a/app/Model/Permission/Department.php
+++ b/app/Model/Permission/Department.php
@@ -76,6 +76,7 @@ public function leader(): BelongsToMany
 
     public function children(): HasMany
     {
+        // @phpstan-ignore-next-line
         return $this->hasMany(self::class, 'parent_id', 'id')->with(['children', 'positions']);
     }
 
diff --git a/app/Repository/Permission/DepartmentRepository.php b/app/Repository/Permission/DepartmentRepository.php
index b04c5c773..972f1938a 100644
--- a/app/Repository/Permission/DepartmentRepository.php
+++ b/app/Repository/Permission/DepartmentRepository.php
@@ -29,7 +29,7 @@ public function __construct(
 
     public function getByIds(array $ids): Collection
     {
-        return $this->model->whereIn('id', $ids)->get();
+        return $this->model->newQuery()->whereIn('id', $ids)->get();
     }
 
     public function handleSearch(Builder $query, array $params): Builder
diff --git a/app/Repository/Permission/LeaderRepository.php b/app/Repository/Permission/LeaderRepository.php
index bb409e256..8e78012db 100644
--- a/app/Repository/Permission/LeaderRepository.php
+++ b/app/Repository/Permission/LeaderRepository.php
@@ -31,7 +31,8 @@ public function create(array $data): mixed
             Leader::query()->where('dept_id', $data['dept_id'])->where('user_id', $id)->forceDelete();
             Leader::create(['dept_id' => $data['dept_id'], 'user_id' => $id, 'created_at' => date('Y-m-d H:i:s')]);
         }
-        return true;
+        // @phpstan-ignore-next-line
+        return null;
     }
 
     public function deleteByDoubleKey(int $dept_id, array $user_ids): void
diff --git a/app/Schema/PolicySchema.php b/app/Schema/PolicySchema.php
index f31abcd5a..3d7a1ebbb 100644
--- a/app/Schema/PolicySchema.php
+++ b/app/Schema/PolicySchema.php
@@ -32,7 +32,7 @@ class PolicySchema implements \JsonSerializable
     #[Property(property: 'value', title: '策略值', type: 'object')]
     protected array $value;
 
-    public function __construct(Policy $model) {}
+    public function __construct(protected Policy $model) {}
 
     public function jsonSerialize(): mixed
     {
diff --git a/app/Service/Permission/UserService.php b/app/Service/Permission/UserService.php
index f91cb3c63..9e47d0c78 100644
--- a/app/Service/Permission/UserService.php
+++ b/app/Service/Permission/UserService.php
@@ -80,7 +80,7 @@ public function create(array $data): mixed
     public function updateById(mixed $id, array $data): mixed
     {
         return Db::transaction(function () use ($id, $data) {
-            /** @var User $entity */
+            /** @var null|User $entity */
             $entity = $this->repository->findById($id);
             if (empty($entity)) {
                 throw new BusinessException(ResultCode::NOT_FOUND);
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
index ea2e2ebc1..39b582027 100644
--- a/phpstan.neon.dist
+++ b/phpstan.neon.dist
@@ -7,6 +7,7 @@ parameters:
   reportUnmatchedIgnoredErrors: false
   excludePaths:
     - tests/
+    - app/Library/DataPermission/Scope/DataScopes.php
   ignoreErrors:
     - '#Static call to instance method Hyperf\\HttpServer\\Router\\Router::[a-zA-Z0-9\\_]+\(\)#'
     - '#Static call to instance method Hyperf\\DbConnection\\Db::[a-zA-Z0-9\\_]+\(\)#'

From 3a858b8a73207dd6ee6b3a4adf66ff885eda2e42 Mon Sep 17 00:00:00 2001
From: "X.Mo" <root@imoi.cn>
Date: Wed, 28 May 2025 09:30:58 +0800
Subject: [PATCH 71/91] =?UTF-8?q?feat(user):=20=E7=82=B9=E5=87=BB=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E9=87=8D=E7=BD=AE=E6=8C=89=E9=92=AE=EF=BC=8C=E4=B9=9F?=
 =?UTF-8?q?=E6=B8=85=E7=A9=BA=E9=83=A8=E9=97=A8=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/src/modules/base/views/permission/user/index.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/web/src/modules/base/views/permission/user/index.vue b/web/src/modules/base/views/permission/user/index.vue
index 8bdb7edac..92d5ecad3 100644
--- a/web/src/modules/base/views/permission/user/index.vue
+++ b/web/src/modules/base/views/permission/user/index.vue
@@ -129,6 +129,9 @@ const options = ref<MaProTableOptions>({
   requestOptions: {
     api: page,
   },
+  onSearchReset: () => {
+    proTableRef.value.setRequestParams({ department_id: undefined }, false)
+  },
 })
 // 架构配置
 const schema = ref<MaProTableSchema>({

From 76f5ba6a58c580c0bf43d0021cb06affb3eb834f Mon Sep 17 00:00:00 2001
From: "X.Mo" <root@imoi.cn>
Date: Wed, 28 May 2025 11:52:21 +0800
Subject: [PATCH 72/91] =?UTF-8?q?fix(login):=20=E4=BF=AE=E5=A4=8D=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E7=99=BB=E5=BD=95=E5=90=8E=E6=9C=AA=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E8=AF=AD=E8=A8=80=E6=A0=87=E8=AE=B0=EF=BC=8C=E9=80=A0=E6=88=90?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E4=B8=BA=E8=8B=B1=E6=96=87=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/src/store/modules/useUserStore.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/web/src/store/modules/useUserStore.ts b/web/src/store/modules/useUserStore.ts
index b2124afda..4e96d2913 100644
--- a/web/src/store/modules/useUserStore.ts
+++ b/web/src/store/modules/useUserStore.ts
@@ -13,7 +13,7 @@ import useThemeColor from '@/hooks/useThemeColor.ts'
 import useHttp from '@/hooks/auto-imports/useHttp.ts'
 import * as PermissionApi from '~/base/api/permission.ts'
 import type { MenuVo, RoleVo } from '~/base/api/permission.ts'
-import { recursionGetKey } from '@/utils/recursionGetKey.ts';
+import { recursionGetKey } from '@/utils/recursionGetKey.ts'
 
 export interface LoginParams {
   username: string
@@ -204,6 +204,7 @@ const useUserStore = defineStore(
     function setUserSetting(settings: any) {
       settings && setting.setSettings(settings)
       setting.initColorMode()
+      setLanguage(settings?.app?.useLocale ?? 'zh_CN')
       useThemeColor().initThemeColor()
     }
 

From 3ea87e24a16e22b699dfcf455e070661c848101f Mon Sep 17 00:00:00 2001
From: cjx <jujijigo@qq.com>
Date: Wed, 28 May 2025 14:12:28 +0800
Subject: [PATCH 73/91] =?UTF-8?q?fix(permission):=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=A8=A1=E5=9E=8B=E4=B8=8E=E7=AD=96=E7=95=A5?=
 =?UTF-8?q?=E5=85=B3=E8=81=94=E7=9A=84=E9=94=99=E8=AF=AF=EF=BC=8C=E5=B9=B6?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90=E5=85=A8?=
 =?UTF-8?q?=E5=B1=80=E4=BD=9C=E7=94=A8=E5=9F=9F=E7=9A=84=E5=AE=9E=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Library/DataPermission/Scope/DataScopes.php | 3 ++-
 app/Model/Permission/User.php                   | 2 +-
 app/Service/Permission/UserService.php          | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/Library/DataPermission/Scope/DataScopes.php b/app/Library/DataPermission/Scope/DataScopes.php
index 6f7af04bb..cb9bc3ce4 100644
--- a/app/Library/DataPermission/Scope/DataScopes.php
+++ b/app/Library/DataPermission/Scope/DataScopes.php
@@ -13,6 +13,7 @@
 namespace App\Library\DataPermission\Scope;
 
 use Hyperf\DbConnection\Model\Model;
+use Hyperf\Context\ApplicationContext;
 
 /**
  * @internal
@@ -22,6 +23,6 @@ trait DataScopes
 {
     public static function bootDataScopes(): void
     {
-        static::addGlobalScope(DataScope::class);
+        static::addGlobalScope(ApplicationContext::getContainer()->get(DataScope::class));
     }
 }
diff --git a/app/Model/Permission/User.php b/app/Model/Permission/User.php
index 43634731b..ace35232a 100644
--- a/app/Model/Permission/User.php
+++ b/app/Model/Permission/User.php
@@ -146,7 +146,7 @@ public function hasPermission(string $permission): bool
 
     public function policy(): BelongsTo
     {
-        return $this->belongsTo(Policy::class, 'id', 'id');
+        return $this->belongsTo(Policy::class, 'id', 'user_id');
     }
 
     public function department(): BelongsToMany
diff --git a/app/Service/Permission/UserService.php b/app/Service/Permission/UserService.php
index 9e47d0c78..e1959700c 100644
--- a/app/Service/Permission/UserService.php
+++ b/app/Service/Permission/UserService.php
@@ -112,7 +112,7 @@ protected function handleWith(User $entity, array $data): void
             if ($policy) {
                 $policy->fill($data['policy'])->save();
             } else {
-                $entity->policy()->create($data['policy']);
+                $entity->policy()->create(array_merge($data['policy'], ['user_id' => $entity->id]));
             }
         }
     }

From 9b191a778cf09ee53abd3a7cae3aa17e2b8e6515 Mon Sep 17 00:00:00 2001
From: zds <49744633+zds-s@users.noreply.github.com>
Date: Wed, 28 May 2025 15:24:42 +0800
Subject: [PATCH 74/91] refactor(data-permission): simplify Factory usage in
 DataScope and remove unnecessary constructor

---
 app/Library/DataPermission/Factory.php          | 6 ++++++
 app/Library/DataPermission/Scope/DataScope.php  | 8 +-------
 app/Library/DataPermission/Scope/DataScopes.php | 3 +--
 app/Service/Permission/UserService.php          | 2 +-
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/app/Library/DataPermission/Factory.php b/app/Library/DataPermission/Factory.php
index de3fdc84a..504dd95e0 100644
--- a/app/Library/DataPermission/Factory.php
+++ b/app/Library/DataPermission/Factory.php
@@ -16,6 +16,7 @@
 use App\Model\DataPermission\Policy;
 use App\Model\Enums\DataPermission\PolicyType;
 use App\Model\Permission\User;
+use Hyperf\Context\ApplicationContext;
 use Hyperf\Database\Query\Builder;
 
 final class Factory
@@ -24,6 +25,11 @@ public function __construct(
         private readonly Rule $rule
     ) {}
 
+    public static function make(): self
+    {
+        return ApplicationContext::getContainer()->get(self::class);
+    }
+
     public function build(
         Builder $builder,
         User $user,
diff --git a/app/Library/DataPermission/Scope/DataScope.php b/app/Library/DataPermission/Scope/DataScope.php
index cac66297f..e27a7cb45 100644
--- a/app/Library/DataPermission/Scope/DataScope.php
+++ b/app/Library/DataPermission/Scope/DataScope.php
@@ -20,12 +20,6 @@
 
 class DataScope implements Scope
 {
-    protected array $extensions = [];
-
-    public function __construct(
-        private readonly Factory $factory
-    ) {}
-
     public function apply(Builder $builder, Model $model): void
     {
         $user = CurrentUser::ctxUser();
@@ -33,6 +27,6 @@ public function apply(Builder $builder, Model $model): void
             return;
         }
 
-        $this->factory->build($builder->getQuery(), $user);
+        Factory::make()->build($builder->getQuery(), $user);
     }
 }
diff --git a/app/Library/DataPermission/Scope/DataScopes.php b/app/Library/DataPermission/Scope/DataScopes.php
index cb9bc3ce4..3d7f8a26b 100644
--- a/app/Library/DataPermission/Scope/DataScopes.php
+++ b/app/Library/DataPermission/Scope/DataScopes.php
@@ -13,7 +13,6 @@
 namespace App\Library\DataPermission\Scope;
 
 use Hyperf\DbConnection\Model\Model;
-use Hyperf\Context\ApplicationContext;
 
 /**
  * @internal
@@ -23,6 +22,6 @@ trait DataScopes
 {
     public static function bootDataScopes(): void
     {
-        static::addGlobalScope(ApplicationContext::getContainer()->get(DataScope::class));
+        static::addGlobalScope(new DataScope());
     }
 }
diff --git a/app/Service/Permission/UserService.php b/app/Service/Permission/UserService.php
index e1959700c..9e47d0c78 100644
--- a/app/Service/Permission/UserService.php
+++ b/app/Service/Permission/UserService.php
@@ -112,7 +112,7 @@ protected function handleWith(User $entity, array $data): void
             if ($policy) {
                 $policy->fill($data['policy'])->save();
             } else {
-                $entity->policy()->create(array_merge($data['policy'], ['user_id' => $entity->id]));
+                $entity->policy()->create($data['policy']);
             }
         }
     }

From ad9ce65a4bd1be0b3f9d6a6798e584b8e1dca34b Mon Sep 17 00:00:00 2001
From: zds <49744633+zds-s@users.noreply.github.com>
Date: Wed, 28 May 2025 18:22:55 +0800
Subject: [PATCH 75/91] refactor(data-permission): use Arr::get for safer
 attribute retrieval in DataScopeAspect

---
 app/Library/DataPermission/Aspects/DataScopeAspect.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/Library/DataPermission/Aspects/DataScopeAspect.php b/app/Library/DataPermission/Aspects/DataScopeAspect.php
index 4af4a20f5..60c904105 100644
--- a/app/Library/DataPermission/Aspects/DataScopeAspect.php
+++ b/app/Library/DataPermission/Aspects/DataScopeAspect.php
@@ -16,6 +16,7 @@
 use App\Library\DataPermission\Attribute\DataScope;
 use App\Library\DataPermission\Context as DataPermissionContext;
 use App\Library\DataPermission\Factory;
+use Hyperf\Collection\Arr;
 use Hyperf\Context\Context;
 use Hyperf\Database\Query\Builder;
 use Hyperf\Di\Annotation\Aspect;
@@ -100,9 +101,9 @@ protected function handleDataScope(ProceedingJoinPoint $proceedingJoinPoint)
         /**
          * @var null|DataScope $attribute
          */
-        $attribute = $proceedingJoinPoint->getAnnotationMetadata()->class[DataScope::class] ?: null;
+        $attribute = Arr::get($proceedingJoinPoint->getAnnotationMetadata()->class, DataScope::class);
         if ($attribute === null) {
-            $attribute = $proceedingJoinPoint->getAnnotationMetadata()->method[DataScope::class] ?: null;
+            $attribute = Arr::get($proceedingJoinPoint->getAnnotationMetadata()->method, DataScope::class);
         }
         if ($attribute === null) {
             return $proceedingJoinPoint->process();

From c17fe0cd164a4ddc906a9d482df454a1404d367e Mon Sep 17 00:00:00 2001
From: zds <49744633+zds-s@users.noreply.github.com>
Date: Thu, 29 May 2025 16:20:44 +0800
Subject: [PATCH 76/91] fix(CreatedByIdsExecute): replace whereIn with where
 for department ID queries

---
 .../Rule/Executable/CreatedByIdsExecute.php               | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/Library/DataPermission/Rule/Executable/CreatedByIdsExecute.php b/app/Library/DataPermission/Rule/Executable/CreatedByIdsExecute.php
index bb9e9b43e..248fa56eb 100644
--- a/app/Library/DataPermission/Rule/Executable/CreatedByIdsExecute.php
+++ b/app/Library/DataPermission/Rule/Executable/CreatedByIdsExecute.php
@@ -60,7 +60,7 @@ public function execute(): ?array
                 // @phpstan-ignore-next-line
                 $this->getUser()->newQuery()
                     ->whereHas('department', static function ($query) use ($department) {
-                        $query->whereIn('id', $department->id);
+                        $query->where('id', $department->id);
                         // @phpstan-ignore-next-line
                     })->get()->each(static function (User $user) use (&$ids) {
                         $ids[] = $user->id;
@@ -88,7 +88,7 @@ public function execute(): ?array
                     $department->getFlatChildren()->each(function (Department $department) use (&$ids) {
                         $this->getUser()->newQuery()
                             ->whereHas('department', static function ($query) use ($department) {
-                                $query->whereIn('id', $department->id);
+                                $query->where('id', $department->id);
                                 // @phpstan-ignore-next-line
                             })->get()->each(static function (User $user) use (&$ids) {
                                 $ids[] = $user->id;
@@ -106,7 +106,7 @@ public function execute(): ?array
                     $position->department()->get()->each(function (Department $department) use (&$ids) {
                         $this->getUser()->newQuery()
                             ->whereHas('department', static function ($query) use ($department) {
-                                $query->whereIn('id', $department->id);
+                                $query->where('id', $department->id);
                                 // @phpstan-ignore-next-line
                             })->get()->each(static function (User $user) use (&$ids) {
                                 $ids[] = $user->id;
@@ -119,7 +119,7 @@ public function execute(): ?array
                         $department->getFlatChildren()->each(function (Department $department) use (&$ids) {
                             $this->getUser()->newQuery()
                                 ->whereHas('department', static function ($query) use ($department) {
-                                    $query->whereIn('id', $department->id);
+                                    $query->where('id', $department->id);
                                     // @phpstan-ignore-next-line
                                 })->get()->each(static function (User $user) use (&$ids) {
                                     $ids[] = $user->id;

From 69f0294893109f3af10fb96b3d2a155a66f59ee0 Mon Sep 17 00:00:00 2001
From: zds <49744633+zds-s@users.noreply.github.com>
Date: Thu, 29 May 2025 16:48:20 +0800
Subject: [PATCH 77/91] fix(CreatedByIdsExecute): ensure unique user IDs are
 returned in execute method

---
 .../DataPermission/Rule/Executable/CreatedByIdsExecute.php      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Library/DataPermission/Rule/Executable/CreatedByIdsExecute.php b/app/Library/DataPermission/Rule/Executable/CreatedByIdsExecute.php
index 248fa56eb..8ddbf19f9 100644
--- a/app/Library/DataPermission/Rule/Executable/CreatedByIdsExecute.php
+++ b/app/Library/DataPermission/Rule/Executable/CreatedByIdsExecute.php
@@ -129,6 +129,6 @@ public function execute(): ?array
                 }
             }
         }
-        return $ids;
+        return array_unique($ids);
     }
 }

From ee8a401a60f7e1be5d15c152de64bab0081ce911 Mon Sep 17 00:00:00 2001
From: zds <49744633+zds-s@users.noreply.github.com>
Date: Fri, 30 May 2025 01:13:41 +0800
Subject: [PATCH 78/91] fix(CreatedByIdsExecute): remove unnecessary department
 list processing in execute method

---
 .../Rule/Executable/CreatedByIdsExecute.php         | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/app/Library/DataPermission/Rule/Executable/CreatedByIdsExecute.php b/app/Library/DataPermission/Rule/Executable/CreatedByIdsExecute.php
index 8ddbf19f9..7d23d4fa9 100644
--- a/app/Library/DataPermission/Rule/Executable/CreatedByIdsExecute.php
+++ b/app/Library/DataPermission/Rule/Executable/CreatedByIdsExecute.php
@@ -55,18 +55,7 @@ public function execute(): ?array
         if ($policyType->isSelf()) {
             return $ids;
         }
-        if (! empty($departmentList)) {
-            foreach ($departmentList as $department) {
-                // @phpstan-ignore-next-line
-                $this->getUser()->newQuery()
-                    ->whereHas('department', static function ($query) use ($department) {
-                        $query->where('id', $department->id);
-                        // @phpstan-ignore-next-line
-                    })->get()->each(static function (User $user) use (&$ids) {
-                        $ids[] = $user->id;
-                    });
-            }
-        }
+
         if ($policyType->isNotCustomFunc() && $policyType->isNotCustomDept()) {
             /**
              * @var Collection|Department[] $leaderDepartmentList

From 18bc1a62188dfdf2b2e15a1f5e1974a8ba0b93a8 Mon Sep 17 00:00:00 2001
From: zds <49744633+zds-s@users.noreply.github.com>
Date: Fri, 30 May 2025 07:28:53 +0800
Subject: [PATCH 79/91] feat(CreatedByIdsExecute): add user ID retrieval for
 department and department tree policies

---
 .../Rule/Executable/CreatedByIdsExecute.php   | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/app/Library/DataPermission/Rule/Executable/CreatedByIdsExecute.php b/app/Library/DataPermission/Rule/Executable/CreatedByIdsExecute.php
index 7d23d4fa9..3e018115d 100644
--- a/app/Library/DataPermission/Rule/Executable/CreatedByIdsExecute.php
+++ b/app/Library/DataPermission/Rule/Executable/CreatedByIdsExecute.php
@@ -117,6 +117,33 @@ public function execute(): ?array
                     });
                 }
             }
+
+            if (! empty($departmentList)) {
+                foreach ($departmentList as $department) {
+                    if ($policyType->isDeptSelf()) {
+                        // @phpstan-ignore-next-line
+                        $this->getUser()->newQuery()
+                            ->whereHas('department', static function ($query) use ($department) {
+                                $query->where('id', $department->id);
+                                // @phpstan-ignore-next-line
+                            })->get()->each(static function (User $user) use (&$ids) {
+                                $ids[] = $user->id;
+                            });
+                    }
+                    if ($policyType->isDeptTree()) {
+                        // @phpstan-ignore-next-line
+                        $department->getFlatChildren()->each(function (Department $department) use (&$ids) {
+                            $this->getUser()->newQuery()
+                                ->whereHas('department', static function ($query) use ($department) {
+                                    $query->where('id', $department->id);
+                                    // @phpstan-ignore-next-line
+                                })->get()->each(static function (User $user) use (&$ids) {
+                                    $ids[] = $user->id;
+                                });
+                        });
+                    }
+                }
+            }
         }
         return array_unique($ids);
     }

From e64436498315b962259132cdeb35a6eeb1ab3971 Mon Sep 17 00:00:00 2001
From: zds <49744633+zds-s@users.noreply.github.com>
Date: Fri, 30 May 2025 07:50:58 +0800
Subject: [PATCH 80/91] refactor: remove final keyword from classes in
 DataPermission module

---
 .../DataPermission/Attribute/DataScope.php    |   2 +-
 app/Library/DataPermission/Context.php        |   2 +-
 app/Library/DataPermission/Factory.php        |   2 +-
 .../DataPermission/Rule/CustomFuncFactory.php |   2 +-
 .../Rule/Executable/CreatedByIdsExecute.php   |   2 +-
 .../Rule/Executable/DeptExecute.php           |   2 +-
 app/Library/DataPermission/Rule/Rule.php      |   2 +-
 .../DataPermission/DataScopeAspectTest.php    | 160 ++++++++++++++++++
 8 files changed, 167 insertions(+), 7 deletions(-)
 create mode 100644 tests/Feature/Library/DataPermission/DataScopeAspectTest.php

diff --git a/app/Library/DataPermission/Attribute/DataScope.php b/app/Library/DataPermission/Attribute/DataScope.php
index 498a48684..398ddfa3a 100644
--- a/app/Library/DataPermission/Attribute/DataScope.php
+++ b/app/Library/DataPermission/Attribute/DataScope.php
@@ -16,7 +16,7 @@
 use Hyperf\Di\Annotation\AbstractAnnotation;
 
 #[\Attribute(\Attribute::TARGET_CLASS | \Attribute::TARGET_METHOD)]
-final class DataScope extends AbstractAnnotation
+class DataScope extends AbstractAnnotation
 {
     public function __construct(
         private readonly string $deptColumn = 'dept_id',
diff --git a/app/Library/DataPermission/Context.php b/app/Library/DataPermission/Context.php
index 1ef3be8fc..e51308684 100644
--- a/app/Library/DataPermission/Context.php
+++ b/app/Library/DataPermission/Context.php
@@ -24,7 +24,7 @@ final class Context
 
     private const ONLY_TABLES_KEY = 'data_permission_only_tables';
 
-    public static function setOnlyTables(array $tables): void
+    public static function setOnlyTables(?array $tables): void
     {
         Ctx::set(self::ONLY_TABLES_KEY, $tables);
     }
diff --git a/app/Library/DataPermission/Factory.php b/app/Library/DataPermission/Factory.php
index 504dd95e0..59ae96b9f 100644
--- a/app/Library/DataPermission/Factory.php
+++ b/app/Library/DataPermission/Factory.php
@@ -19,7 +19,7 @@
 use Hyperf\Context\ApplicationContext;
 use Hyperf\Database\Query\Builder;
 
-final class Factory
+class Factory
 {
     public function __construct(
         private readonly Rule $rule
diff --git a/app/Library/DataPermission/Rule/CustomFuncFactory.php b/app/Library/DataPermission/Rule/CustomFuncFactory.php
index 5ab18eedd..d33bb4d8f 100644
--- a/app/Library/DataPermission/Rule/CustomFuncFactory.php
+++ b/app/Library/DataPermission/Rule/CustomFuncFactory.php
@@ -12,7 +12,7 @@
 
 namespace App\Library\DataPermission\Rule;
 
-final class CustomFuncFactory
+class CustomFuncFactory
 {
     /**
      * @var array<string,\Closure>
diff --git a/app/Library/DataPermission/Rule/Executable/CreatedByIdsExecute.php b/app/Library/DataPermission/Rule/Executable/CreatedByIdsExecute.php
index 3e018115d..9d00fac92 100644
--- a/app/Library/DataPermission/Rule/Executable/CreatedByIdsExecute.php
+++ b/app/Library/DataPermission/Rule/Executable/CreatedByIdsExecute.php
@@ -18,7 +18,7 @@
 use App\Repository\Permission\DepartmentRepository;
 use Hyperf\Database\Model\Collection;
 
-final class CreatedByIdsExecute extends AbstractExecutable
+class CreatedByIdsExecute extends AbstractExecutable
 {
     public function execute(): ?array
     {
diff --git a/app/Library/DataPermission/Rule/Executable/DeptExecute.php b/app/Library/DataPermission/Rule/Executable/DeptExecute.php
index 787494df2..445936949 100644
--- a/app/Library/DataPermission/Rule/Executable/DeptExecute.php
+++ b/app/Library/DataPermission/Rule/Executable/DeptExecute.php
@@ -17,7 +17,7 @@
 use App\Repository\Permission\DepartmentRepository;
 use Hyperf\Database\Model\Collection;
 
-final class DeptExecute extends AbstractExecutable
+class DeptExecute extends AbstractExecutable
 {
     public function execute(): ?array
     {
diff --git a/app/Library/DataPermission/Rule/Rule.php b/app/Library/DataPermission/Rule/Rule.php
index d8270e9ba..1fbf37cc8 100644
--- a/app/Library/DataPermission/Rule/Rule.php
+++ b/app/Library/DataPermission/Rule/Rule.php
@@ -22,7 +22,7 @@
 use Hyperf\Database\Query\Builder;
 use Psr\SimpleCache\CacheInterface;
 
-final class Rule
+class Rule
 {
     private readonly CacheInterface $cache;
 
diff --git a/tests/Feature/Library/DataPermission/DataScopeAspectTest.php b/tests/Feature/Library/DataPermission/DataScopeAspectTest.php
new file mode 100644
index 000000000..ddd7f2e8b
--- /dev/null
+++ b/tests/Feature/Library/DataPermission/DataScopeAspectTest.php
@@ -0,0 +1,160 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * This file is part of MineAdmin.
+ *
+ * @link     https://www.mineadmin.com
+ * @document https://doc.mineadmin.com
+ * @contact  root@imoi.cn
+ * @license  https://github.com/mineadmin/MineAdmin/blob/master/LICENSE
+ */
+
+namespace HyperfTests\Feature\Library\DataPermission\Aspects;
+
+use App\Http\CurrentUser;
+use App\Library\DataPermission\Aspects\DataScopeAspect;
+use App\Library\DataPermission\Attribute\DataScope;
+use App\Library\DataPermission\Context as DataPermissionContext;
+use App\Library\DataPermission\Factory;
+use App\Library\DataPermission\ScopeType;
+use App\Model\Permission\User;
+use Hyperf\Context\Context;
+use Hyperf\Database\Query\Builder;
+use Hyperf\Di\Aop\AnnotationMetadata;
+use Hyperf\Di\Aop\ProceedingJoinPoint;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * @internal
+ * @coversNothing
+ */
+final class DataScopeAspectTest extends TestCase
+{
+    /** @var Factory|MockObject */
+    private $factory;
+
+    /** @var DataScopeAspect */
+    private $aspect;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+        $this->factory = $this->createMock(Factory::class);
+        $this->aspect = new DataScopeAspect($this->factory);
+        Context::set(DataScopeAspect::CONTEXT_KEY, null);
+        DataPermissionContext::setOnlyTables([]);
+    }
+
+    protected function tearDown(): void
+    {
+        Context::destroy(DataScopeAspect::CONTEXT_KEY);
+        parent::tearDown();
+    }
+
+    public function testProcessWithAnnotationMetadata(): void
+    {
+        $pjp = $this->createMock(ProceedingJoinPoint::class);
+        $annotation = new DataScope();
+        $pjp->method('getAnnotationMetadata')->willReturn(new AnnotationMetadata(...[
+            'class' => [DataScope::class => $annotation],
+            'method' => [],
+        ]));
+        $pjp->expects(self::once())->method('process')->willReturn('result');
+
+        $result = $this->aspect->process($pjp);
+        self::assertEquals('result', $result);
+    }
+
+    public function testProcessWithBuilderRunSelect(): void
+    {
+        $pjp = $this->createMock(ProceedingJoinPoint::class);
+        $pjp->className = Builder::class;
+        $pjp->methodName = 'runSelect';
+
+        $builder = $this->createMock(Builder::class);
+        $builder->from = 'test_table';
+
+        DataPermissionContext::setOnlyTables(['test_table']);
+
+        $pjp->method('getInstance')->willReturn($builder);
+        $pjp->method('getAnnotationMetadata')->willReturn(new AnnotationMetadata(...[
+            'class' => [],
+            'method' => [],
+        ]));
+        $pjp->expects(self::exactly(1))->method('process')
+            ->willReturn('select_result');
+
+        // 模拟 CurrentUser::ctxUser() 返回用户对象
+        $user = new User();
+        Context::set('current_user', $user);
+
+        $this->factory->expects(self::once())->method('build')->with($builder, $user);
+        Context::set(DataScopeAspect::CONTEXT_KEY, 1);
+        $result = $this->aspect->process($pjp);
+        self::assertEquals('select_result', $result);
+    }
+
+    public function testProcessWithBuilderDelete(): void
+    {
+        $pjp = $this->createMock(ProceedingJoinPoint::class);
+        $pjp->className = Builder::class;
+        $pjp->methodName = 'delete';
+        $pjp->method('getAnnotationMetadata')->willReturn(new AnnotationMetadata(...[
+            'class' => [],
+            'method' => [],
+        ]));
+        $pjp->expects(self::once())->method('process')->willReturn('delete_result');
+
+        $result = $this->aspect->process($pjp);
+        self::assertEquals('delete_result', $result);
+    }
+
+    public function testProcessWithBuilderUpdate(): void
+    {
+        $pjp = $this->createMock(ProceedingJoinPoint::class);
+        $pjp->className = Builder::class;
+        $pjp->methodName = 'update';
+        $pjp->method('getAnnotationMetadata')->willReturn(new AnnotationMetadata(...[
+            'class' => [],
+            'method' => [],
+        ]));
+        $pjp->expects(self::once())->method('process')->willReturn('update_result');
+
+        $result = $this->aspect->process($pjp);
+        self::assertEquals('update_result', $result);
+    }
+
+    public function testProcessWithoutAnnotationOrBuilder(): void
+    {
+        $pjp = $this->createMock(ProceedingJoinPoint::class);
+        $pjp->className = 'OtherClass';
+        $pjp->methodName = 'otherMethod';
+        $pjp->method('getAnnotationMetadata')->willReturn(new AnnotationMetadata(...[
+            'class' => [],
+            'method' => [],
+        ]));
+        $pjp->expects(self::once())->method('process')->willReturn('other_result');
+
+        $result = $this->aspect->process($pjp);
+        self::assertEquals('other_result', $result);
+    }
+
+    public function testHandleDataScopeSetsContextAndCallsProcess(): void
+    {
+        $pjp = $this->createMock(ProceedingJoinPoint::class);
+        $attribute = $this->createMock(DataScope::class);
+        $attribute->method('getDeptColumn')->willReturn('dept_id');
+        $attribute->method('getCreatedByColumn')->willReturn('created_by');
+        $attribute->method('getScopeType')->willReturn(ScopeType::DEPT_CREATED_BY);
+        $attribute->method('getOnlyTables')->willReturn(['table1']);
+        $metaData = new AnnotationMetadata([DataScope::class => $attribute], []);
+        $pjp->method('getAnnotationMetadata')->willReturn($metaData);
+        $pjp->expects(self::once())->method('process')->willReturn('scoped_result');
+
+        $result = $this->aspect->process($pjp);
+        self::assertEquals('scoped_result', $result);
+        self::assertNull(Context::get(DataScopeAspect::CONTEXT_KEY));
+    }
+}

From fec538b09dd813e2c9785ed3c98b42976f8f43ef Mon Sep 17 00:00:00 2001
From: westng <57742335+westng@users.noreply.github.com>
Date: Sat, 31 May 2025 12:13:30 +0800
Subject: [PATCH 81/91] =?UTF-8?q?fix(User):=20=E4=BF=AE=E5=A4=8D=20policy?=
 =?UTF-8?q?=20=E5=85=B3=E7=B3=BB=E6=96=B9=E5=90=91=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=EF=BC=8C=E6=94=B9=E4=B8=BA=20hasOne=20=E6=AD=A3=E7=A1=AE?=
 =?UTF-8?q?=E4=BD=93=E7=8E=B0=E4=B8=80=E5=AF=B9=E4=B8=80=E5=85=B3=E7=B3=BB?=
 =?UTF-8?q?=20(#620)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix(User): 修复 policy 关系方向错误，改为 hasOne 正确体现一对一关系

* chore(User): 移除未使用的 BelongsTo 导入
---
 app/Model/Permission/User.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/Model/Permission/User.php b/app/Model/Permission/User.php
index ace35232a..e850a4f6e 100644
--- a/app/Model/Permission/User.php
+++ b/app/Model/Permission/User.php
@@ -19,8 +19,8 @@
 use Hyperf\Collection\Collection;
 use Hyperf\Database\Model\Events\Creating;
 use Hyperf\Database\Model\Events\Deleted;
-use Hyperf\Database\Model\Relations\BelongsTo;
 use Hyperf\Database\Model\Relations\BelongsToMany;
+use Hyperf\Database\Model\Relations\HasOne;
 use Hyperf\DbConnection\Model\Model;
 
 /**
@@ -144,9 +144,9 @@ public function hasPermission(string $permission): bool
         return $this->roles()->whereRelation('menus', 'name', $permission)->exists();
     }
 
-    public function policy(): BelongsTo
+    public function policy(): HasOne
     {
-        return $this->belongsTo(Policy::class, 'id', 'user_id');
+        return $this->hasOne(Policy::class, 'user_id', 'id');
     }
 
     public function department(): BelongsToMany

From 00809ed00a0d7ed555fbcb6fa74ec2cf5cb47a06 Mon Sep 17 00:00:00 2001
From: zds <49744633+zds-s@users.noreply.github.com>
Date: Tue, 3 Jun 2025 22:43:07 +0800
Subject: [PATCH 82/91] fix(DeptExecute): ensure department list is correctly
 updated after merging

---
 app/Library/DataPermission/Rule/Executable/DeptExecute.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/Library/DataPermission/Rule/Executable/DeptExecute.php b/app/Library/DataPermission/Rule/Executable/DeptExecute.php
index 445936949..487f899ba 100644
--- a/app/Library/DataPermission/Rule/Executable/DeptExecute.php
+++ b/app/Library/DataPermission/Rule/Executable/DeptExecute.php
@@ -45,19 +45,19 @@ public function execute(): ?array
              */
             $currentList = $this->getUser()->department()->get();
             foreach ($currentList as $item) {
-                $departmentList->merge($item->getFlatChildren());
+                $departmentList = $departmentList->merge($item->getFlatChildren());
             }
         }
         if (empty($departmentList)) {
             return null;
         }
-        $departmentList->merge($this->getUser()->dept_leader()->get());
+        $departmentList = $departmentList->merge($this->getUser()->dept_leader()->get());
         /**
          * @var Collection|Position[] $positionList
          */
         $positionList = $this->getUser()->position()->get();
         foreach ($positionList as $position) {
-            $departmentList->merge($position->department()->get());
+            $departmentList = $departmentList->merge($position->department()->get());
         }
         return $departmentList->pluck('id')->toArray();
     }

From cd5acf6a17747f4884acf7fc91430cdb96d1dc0c Mon Sep 17 00:00:00 2001
From: "X.Mo" <root@imoi.cn>
Date: Fri, 6 Jun 2025 09:20:20 +0800
Subject: [PATCH 83/91] Update package.json

---
 web/package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/package.json b/web/package.json
index 5ecff8ae1..a41c6e697 100644
--- a/web/package.json
+++ b/web/package.json
@@ -21,8 +21,8 @@
     "@imengyu/vue3-context-menu": "^1.4.4",
     "@mineadmin/echarts": "^1.0.5",
     "@mineadmin/form": "^1.0.51",
-    "@mineadmin/pro-table": "^1.0.67",
-    "@mineadmin/search": "^1.0.37",
+    "@mineadmin/pro-table": "^1.0.71",
+    "@mineadmin/search": "^1.0.51",
     "@mineadmin/table": "^1.0.33",
     "@vueuse/core": "^12.7.0",
     "@vueuse/integrations": "^12.7.0",

From d185edd9e698d61c62f9f4a84e6fd1a935802c4f Mon Sep 17 00:00:00 2001
From: westng <57742335+westng@users.noreply.github.com>
Date: Mon, 16 Jun 2025 09:03:46 +0800
Subject: [PATCH 84/91] =?UTF-8?q?fix(department):=20=E5=B2=97=E4=BD=8D?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=90=8E=E9=A1=B5=E9=9D=A2=E6=9C=AA=E5=88=B7?=
 =?UTF-8?q?=E6=96=B0=E9=97=AE=E9=A2=98=20(#630)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/src/modules/base/views/permission/department/index.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/web/src/modules/base/views/permission/department/index.vue b/web/src/modules/base/views/permission/department/index.vue
index 1a177b836..c8d513445 100644
--- a/web/src/modules/base/views/permission/department/index.vue
+++ b/web/src/modules/base/views/permission/department/index.vue
@@ -74,6 +74,7 @@ const maDialog: UseDialogExpose = useDialog({
       }).catch()
     }
     else if (formType === 'position' || formType === 'viewUser') {
+      proTableRef.value.refresh()
       maDialog.close()
     }
     else {

From c921b3c1f5047a2dd3dff78eb2ee5c441fefdd41 Mon Sep 17 00:00:00 2001
From: "X.Mo" <root@imoi.cn>
Date: Mon, 16 Jun 2025 11:38:08 +0800
Subject: [PATCH 85/91] =?UTF-8?q?chore:=20=E6=9B=B4=E6=96=B0=E4=BE=9D?=
 =?UTF-8?q?=E8=B5=96=E5=8C=85=E7=89=88=E6=9C=AC=EF=BC=8C=E5=8C=85=E6=8B=AC?=
 =?UTF-8?q?=20@mineadmin/pro-table=E3=80=81@mineadmin/search=E3=80=81eleme?=
 =?UTF-8?q?nt-plus=20=E5=B9=B6=E6=96=B0=E5=A2=9E=20inquirer=20=E4=BE=9D?=
 =?UTF-8?q?=E8=B5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/package.json | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/web/package.json b/web/package.json
index a41c6e697..ce4c68031 100644
--- a/web/package.json
+++ b/web/package.json
@@ -21,8 +21,8 @@
     "@imengyu/vue3-context-menu": "^1.4.4",
     "@mineadmin/echarts": "^1.0.5",
     "@mineadmin/form": "^1.0.51",
-    "@mineadmin/pro-table": "^1.0.71",
-    "@mineadmin/search": "^1.0.51",
+    "@mineadmin/pro-table": "^1.0.73",
+    "@mineadmin/search": "^1.0.53",
     "@mineadmin/table": "^1.0.33",
     "@vueuse/core": "^12.7.0",
     "@vueuse/integrations": "^12.7.0",
@@ -30,8 +30,9 @@
     "axios": "^1.8.2",
     "dayjs": "^1.11.13",
     "echarts": "^5.6.0",
-    "element-plus": "^2.9.5",
+    "element-plus": "^2.10.2",
     "floating-vue": "5.2.2",
+    "inquirer": "^12.6.3",
     "lodash-es": "^4.17.21",
     "md-editor-v3": "^5.3.0",
     "nprogress": "^0.2.0",

From a57e8cae0a5d6d7ad2d013f272746d5869ab5cf8 Mon Sep 17 00:00:00 2001
From: "X.Mo" <root@imoi.cn>
Date: Mon, 16 Jun 2025 12:00:15 +0800
Subject: [PATCH 86/91] =?UTF-8?q?chore(user):=20=E5=88=9B=E5=BB=BA?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E8=BF=94=E5=9B=9E=E5=AE=9E=E4=BD=93model?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Service/Permission/UserService.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/Service/Permission/UserService.php b/app/Service/Permission/UserService.php
index 9e47d0c78..b1fe4339e 100644
--- a/app/Service/Permission/UserService.php
+++ b/app/Service/Permission/UserService.php
@@ -74,6 +74,7 @@ public function create(array $data): mixed
             /** @var User $entity */
             $entity = parent::create($data);
             $this->handleWith($entity, $data);
+            return $entity;
         });
     }
 

From bb501d34a5c51a4bbe30d121abd4808324f6ce38 Mon Sep 17 00:00:00 2001
From: "X.Mo" <root@imoi.cn>
Date: Wed, 18 Jun 2025 14:43:00 +0800
Subject: [PATCH 87/91] =?UTF-8?q?update:=20=E5=8D=87=E7=BA=A7=20vue-i18n?=
 =?UTF-8?q?=20=E4=BE=9D=E8=B5=96=E7=89=88=E6=9C=AC=E8=87=B3=2011.1.6=20(#6?=
 =?UTF-8?q?32)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/package.json b/web/package.json
index ce4c68031..00e5863d3 100644
--- a/web/package.json
+++ b/web/package.json
@@ -47,7 +47,7 @@
     "sortablejs": "1.15.6",
     "vaul-vue": "^0.3.0",
     "vue": "^3.5.13",
-    "vue-i18n": "^11.1.2",
+    "vue-i18n": "^11.1.6",
     "vue-m-message": "^4.0.2",
     "vue-router": "^4.5.0",
     "vue3-sfc-loader": "^0.9.5",

From b0474492b4fb8144263d625718b4d375e5f03896 Mon Sep 17 00:00:00 2001
From: "X.Mo" <root@imoi.cn>
Date: Wed, 18 Jun 2025 14:56:46 +0800
Subject: [PATCH 88/91] =?UTF-8?q?Revert=20"update:=20=E5=8D=87=E7=BA=A7=20?=
 =?UTF-8?q?vue-i18n=20=E4=BE=9D=E8=B5=96=E7=89=88=E6=9C=AC=E8=87=B3=2011.1?=
 =?UTF-8?q?.6"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit e862a8b6f7bcc5d5bd4e7651724b7aa1d88a4b82.
---
 web/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/package.json b/web/package.json
index 00e5863d3..ce4c68031 100644
--- a/web/package.json
+++ b/web/package.json
@@ -47,7 +47,7 @@
     "sortablejs": "1.15.6",
     "vaul-vue": "^0.3.0",
     "vue": "^3.5.13",
-    "vue-i18n": "^11.1.6",
+    "vue-i18n": "^11.1.2",
     "vue-m-message": "^4.0.2",
     "vue-router": "^4.5.0",
     "vue3-sfc-loader": "^0.9.5",

From d01887e1374985bb2fa87f4f7fa30fc19a65959e Mon Sep 17 00:00:00 2001
From: westng <57742335+westng@users.noreply.github.com>
Date: Fri, 20 Jun 2025 15:11:52 +0800
Subject: [PATCH 89/91] =?UTF-8?q?fix(package):=20=E9=99=8D=E4=BD=8Evue-i18?=
 =?UTF-8?q?n=E7=89=88=E6=9C=AC=E5=8F=B7=20(#635)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/package.json b/web/package.json
index ce4c68031..7e815a42a 100644
--- a/web/package.json
+++ b/web/package.json
@@ -47,7 +47,7 @@
     "sortablejs": "1.15.6",
     "vaul-vue": "^0.3.0",
     "vue": "^3.5.13",
-    "vue-i18n": "^11.1.2",
+    "vue-i18n": "11.1.2",
     "vue-m-message": "^4.0.2",
     "vue-router": "^4.5.0",
     "vue3-sfc-loader": "^0.9.5",

From c7f2dd9f5ae109b26b7c04901986878dc9a90b93 Mon Sep 17 00:00:00 2001
From: "943891935@qq.com" <943891935@qq.com>
Date: Mon, 23 Jun 2025 10:34:22 +0800
Subject: [PATCH 90/91] feat: add redis connection check. Prevent the "DNS
 Lookup resolution failed" error

---
 .../RedisConnectionCheckSubscriber.php        | 59 +++++++++++++++++++
 1 file changed, 59 insertions(+)
 create mode 100644 app/Listener/RedisConnectionCheckSubscriber.php

diff --git a/app/Listener/RedisConnectionCheckSubscriber.php b/app/Listener/RedisConnectionCheckSubscriber.php
new file mode 100644
index 000000000..b2c9d630e
--- /dev/null
+++ b/app/Listener/RedisConnectionCheckSubscriber.php
@@ -0,0 +1,59 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * This file is part of MineAdmin.
+ *
+ * @link     https://www.mineadmin.com
+ * @document https://doc.mineadmin.com
+ * @contact  root@imoi.cn
+ * @license  https://github.com/mineadmin/MineAdmin/blob/master/LICENSE
+ */
+
+namespace App\Listener;
+
+use Hyperf\Contract\StdoutLoggerInterface;
+use Hyperf\Event\Annotation\Listener;
+use Hyperf\Event\Contract\ListenerInterface;
+use Hyperf\Framework\Event\BootApplication;
+use Hyperf\Redis\RedisFactory;
+use Psr\Container\ContainerInterface;
+use Psr\Log\LoggerInterface;
+
+#[Listener]
+class RedisConnectionCheckSubscriber implements ListenerInterface
+{
+    public function __construct(
+        private readonly ContainerInterface $container,
+        private readonly LoggerInterface $logger
+    ) {}
+
+    public function listen(): array
+    {
+        return [
+            BootApplication::class,
+        ];
+    }
+
+    public function process(object $event): void
+    {
+        if ($event instanceof BootApplication) {
+            $this->checkRedisConnection();
+        }
+    }
+
+    private function checkRedisConnection(): void
+    {
+        try {
+            $redis = $this->container->get(RedisFactory::class)->get('default');
+            $result = $redis->ping();
+            if ($result !== 'PONG') {
+                $this->logger->error('Redis connection failed: Invalid ping response');
+                $this->container->get(StdoutLoggerInterface::class)->error('Redis connection failed: Invalid ping response');
+            }
+        } catch (\Throwable $e) {
+            $this->logger->error('Redis connection failed: ' . $e->getMessage());
+            $this->container->get(StdoutLoggerInterface::class)->error('Redis connection failed, please check redis config in .env file');
+        }
+    }
+}

From 58ebe828385f030aa9c6178b982a1aef7303dbfb Mon Sep 17 00:00:00 2001
From: luckydog <943891935@qq.com>
Date: Mon, 23 Jun 2025 10:58:14 +0800
Subject: [PATCH 91/91] Update RedisConnectionCheckSubscriber.php

! $result
---
 app/Listener/RedisConnectionCheckSubscriber.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Listener/RedisConnectionCheckSubscriber.php b/app/Listener/RedisConnectionCheckSubscriber.php
index b2c9d630e..5fb3426be 100644
--- a/app/Listener/RedisConnectionCheckSubscriber.php
+++ b/app/Listener/RedisConnectionCheckSubscriber.php
@@ -47,7 +47,7 @@ private function checkRedisConnection(): void
         try {
             $redis = $this->container->get(RedisFactory::class)->get('default');
             $result = $redis->ping();
-            if ($result !== 'PONG') {
+            if (! $result) {
                 $this->logger->error('Redis connection failed: Invalid ping response');
                 $this->container->get(StdoutLoggerInterface::class)->error('Redis connection failed: Invalid ping response');
             }