From 22ba44c2711049d24447204be77fb619d3b018f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A9=99=E5=AD=90?= <454313500@qq.com>
Date: Tue, 15 Oct 2024 23:26:18 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=AE=8C=E5=96=84=E9=83=A8=E9=97=A8?=
 =?UTF-8?q?=E7=BC=96=E5=8F=B7=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Entities/DeptAggregateRoot.cs              |  4 ++--
 .../DataSeeds/DeptDataSeed.cs                  | 18 +++++++++---------
 Yi.RuoYi.Vue3/src/views/system/dept/index.vue  | 16 ++++++++++++++++
 3 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Entities/DeptAggregateRoot.cs b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Entities/DeptAggregateRoot.cs
index ad855069..17fc6ac6 100644
--- a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Entities/DeptAggregateRoot.cs
+++ b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Entities/DeptAggregateRoot.cs
@@ -63,12 +63,12 @@ namespace Yi.Framework.Rbac.Domain.Entities
         /// <summary>
         /// 部门名称 
         ///</summary>
-        public string DeptName { get; set; } = string.Empty;
+        public string DeptName { get; set; }
         /// <summary>
         /// 部门编码 
         ///</summary>
         [SugarColumn(ColumnName = "DeptCode")]
-        public string DeptCode { get; set; } = string.Empty;
+        public string DeptCode { get; set; }
         /// <summary>
         /// 负责人 
         ///</summary>
diff --git a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.SqlSugarCore/DataSeeds/DeptDataSeed.cs b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.SqlSugarCore/DataSeeds/DeptDataSeed.cs
index d3e3ae49..377a409a 100644
--- a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.SqlSugarCore/DataSeeds/DeptDataSeed.cs
+++ b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.SqlSugarCore/DataSeeds/DeptDataSeed.cs
@@ -41,7 +41,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds
 
             DeptAggregateRoot shenzhenDept = new DeptAggregateRoot(_guidGenerator.Create())
             {
-
+                DeptCode = "SZ",
                 DeptName = "深圳总公司",
                 OrderNum = 100,
                 IsDeleted = false,
@@ -52,7 +52,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds
 
             DeptAggregateRoot jiangxiDept = new DeptAggregateRoot(_guidGenerator.Create())
             {
-
+                DeptCode = "JX",
                 DeptName = "江西总公司",
                 OrderNum = 100,
                 IsDeleted = false,
@@ -64,7 +64,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds
 
             DeptAggregateRoot szDept1 = new DeptAggregateRoot(_guidGenerator.Create())
             {
-
+                DeptCode = "YF",
                 DeptName = "研发部门",
                 OrderNum = 100,
                 IsDeleted = false,
@@ -74,7 +74,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds
 
             DeptAggregateRoot szDept2 = new DeptAggregateRoot(_guidGenerator.Create())
             {
-
+                DeptCode = "SC",
                 DeptName = "市场部门",
                 OrderNum = 100,
                 IsDeleted = false,
@@ -84,7 +84,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds
 
             DeptAggregateRoot szDept3 = new DeptAggregateRoot(_guidGenerator.Create())
             {
-
+                DeptCode = "CS",
                 DeptName = "测试部门",
                 OrderNum = 100,
                 IsDeleted = false,
@@ -94,7 +94,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds
 
             DeptAggregateRoot szDept4 = new DeptAggregateRoot(_guidGenerator.Create())
             {
-
+                DeptCode = "CW",
                 DeptName = "财务部门",
                 OrderNum = 100,
                 IsDeleted = false,
@@ -104,7 +104,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds
 
             DeptAggregateRoot szDept5 = new DeptAggregateRoot(_guidGenerator.Create())
             {
-
+                DeptCode = "YW",
                 DeptName = "运维部门",
                 OrderNum = 100,
                 IsDeleted = false,
@@ -115,7 +115,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds
 
             DeptAggregateRoot jxDept1 = new DeptAggregateRoot(_guidGenerator.Create())
             {
-
+                DeptCode = "SC",
                 DeptName = "市场部门",
                 OrderNum = 100,
                 IsDeleted = false,
@@ -126,7 +126,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds
 
             DeptAggregateRoot jxDept2 = new DeptAggregateRoot(_guidGenerator.Create())
             {
-
+                DeptCode = "CW2",
                 DeptName = "财务部门",
                 OrderNum = 100,
                 IsDeleted = false,
diff --git a/Yi.RuoYi.Vue3/src/views/system/dept/index.vue b/Yi.RuoYi.Vue3/src/views/system/dept/index.vue
index 32b73c1e..3ab7c4df 100644
--- a/Yi.RuoYi.Vue3/src/views/system/dept/index.vue
+++ b/Yi.RuoYi.Vue3/src/views/system/dept/index.vue
@@ -9,6 +9,14 @@
                @keyup.enter="handleQuery"
             />
          </el-form-item>
+        <el-form-item label="部门编号" prop="deptCode">
+          <el-input
+              v-model="queryParams.deptCode"
+              placeholder="请输入部门编号"
+              clearable
+              @keyup.enter="handleQuery"
+          />
+        </el-form-item>
          <el-form-item label="状态" prop="state">
             <el-select v-model="queryParams.state" placeholder="部门状态" clearable>
                <el-option
@@ -55,6 +63,7 @@
          :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
       >
          <el-table-column prop="deptName" label="部门名称" width="260"></el-table-column>
+        <el-table-column prop="deptCode" label="部门编号" width="200"></el-table-column>
          <el-table-column prop="orderNum" label="排序" width="200"></el-table-column>
          <el-table-column prop="state" label="状态" width="100">
             <template #default="scope">
@@ -112,6 +121,11 @@
                      <el-input v-model="form.deptName" placeholder="请输入部门名称" />
                   </el-form-item>
                </el-col>
+              <el-col :span="12">
+                <el-form-item label="部门编号" prop="deptCode">
+                  <el-input v-model="form.deptCode" placeholder="部门编号" />
+                </el-form-item>
+              </el-col>
                <el-col :span="12">
                   <el-form-item label="显示排序" prop="orderNum">
                      <el-input-number v-model="form.orderNum" controls-position="right" :min="0" />
@@ -173,11 +187,13 @@ const refreshTable = ref(true);
 const data = reactive({
   form: {},
   queryParams: {
+    deptCode:undefined,
     deptName: undefined,
     state: undefined
   },
   rules: {
     parentId: [{ required: true, message: "上级部门不能为空", trigger: "blur" }],
+    deptCode: [{ required: true, message: "部门编号不能为空", trigger: "blur" }],
     deptName: [{ required: true, message: "部门名称不能为空", trigger: "blur" }],
     orderNum: [{ required: true, message: "显示排序不能为空", trigger: "blur" }],
     email: [{ type: "email", message: "请输入正确的邮箱地址", trigger: ["blur", "change"] }],