From a133dbbfadf89e7d8672fd527ae77149764901b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=88=9A=E8=BE=B0=E5=85=88=E7=94=9F?= Date: Sun, 1 Dec 2024 17:42:06 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=83=A8=E9=97=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../model/response/DepartmentResponse.java | 2 + .../backend/model/response/MenuResponse.java | 26 +++-------- .../db/migration/V1.0.1__init_data.sql | 43 +++++++++---------- 3 files changed, 27 insertions(+), 44 deletions(-) diff --git a/backend/src/main/java/com/qqchen/deploy/backend/model/response/DepartmentResponse.java b/backend/src/main/java/com/qqchen/deploy/backend/model/response/DepartmentResponse.java index 538357f4..a070ef96 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/model/response/DepartmentResponse.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/model/response/DepartmentResponse.java @@ -10,6 +10,8 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) public class DepartmentResponse extends BaseResponse { + private Long id; + /** * 部门编码 */ diff --git a/backend/src/main/java/com/qqchen/deploy/backend/model/response/MenuResponse.java b/backend/src/main/java/com/qqchen/deploy/backend/model/response/MenuResponse.java index 5027c6e4..37f3f5cc 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/model/response/MenuResponse.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/model/response/MenuResponse.java @@ -1,12 +1,15 @@ package com.qqchen.deploy.backend.model.response; +import com.qqchen.deploy.backend.framework.dto.BaseResponse; import lombok.Data; +import lombok.EqualsAndHashCode; import java.time.LocalDateTime; import java.util.List; @Data -public class MenuResponse { +@EqualsAndHashCode(callSuper = true) +public class MenuResponse extends BaseResponse { /** * 菜单ID */ @@ -67,23 +70,4 @@ public class MenuResponse { */ private List children; - /** - * 创建时间 - */ - private LocalDateTime createTime; - - /** - * 更新时间 - */ - private LocalDateTime updateTime; - - /** - * 创建人 - */ - private String createBy; - - /** - * 更新人 - */ - private String updateBy; -} \ No newline at end of file +} \ No newline at end of file diff --git a/backend/src/main/resources/db/migration/V1.0.1__init_data.sql b/backend/src/main/resources/db/migration/V1.0.1__init_data.sql index 39561ff1..d08e8c1c 100644 --- a/backend/src/main/resources/db/migration/V1.0.1__init_data.sql +++ b/backend/src/main/resources/db/migration/V1.0.1__init_data.sql @@ -98,29 +98,26 @@ VALUES (3, 2); -- 运维主管 -> 运维标签 -- 初始化部门数据 -INSERT INTO sys_department (id, create_time, update_time, deleted, version, code, name, description, parent_id, sort, enabled, leader_id, leader_name) -VALUES - -- 总公司 - (1, NOW(), NOW(), false, 1, 'HQ', '总公司', '公司总部', null, 1, true, null, null), - - -- 一级部门 - (2, NOW(), NOW(), false, 1, 'TECH', '技术部', '负责公司技术研发', 1, 1, true, null, null), - (3, NOW(), NOW(), false, 1, 'HR', '人力资源部', '负责人力资源管理', 1, 2, true, null, null), - (4, NOW(), NOW(), false, 1, 'FIN', '财务部', '负责公司财务管理', 1, 3, true, null, null), - (5, NOW(), NOW(), false, 1, 'MKT', '市场部', '负责市场营销', 1, 4, true, null, null), - - -- 技术部下属部门 - (6, NOW(), NOW(), false, 1, 'DEV', '研发部', '负责产品研发', 2, 1, true, null, null), - (7, NOW(), NOW(), false, 1, 'TEST', '测试部', '负责产品测试', 2, 2, true, null, null), - (8, NOW(), NOW(), false, 1, 'OPS', '运维部', '负责系统运维', 2, 3, true, null, null), - - -- 人力资源部下属部门 - (9, NOW(), NOW(), false, 1, 'REC', '招聘部', '负责人员招聘', 3, 1, true, null, null), - (10, NOW(), NOW(), false, 1, 'TRAIN', '培训部', '负责员工培训', 3, 2, true, null, null), - - -- 市场部下属部门 - (11, NOW(), NOW(), false, 1, 'SALES', '销售部', '负责产品销售', 5, 1, true, null, null), - (12, NOW(), NOW(), false, 1, 'PR', '公关部', '负责公共关系', 5, 2, true, null, null); +INSERT INTO sys_department (id, code, name, parent_id, sort, enabled, create_by, create_time, update_by, update_time, version, deleted) VALUES +-- 总公司 +(1, 'HQ', '总公司', 0, 1, 1, 'system', '2024-01-01 00:00:00', 'system', '2024-01-01 00:00:00', 0, 0), + +-- 技术部门 +(2, 'TECH', '技术部', 1, 1, 1, 'system', '2024-01-01 00:00:00', 'system', '2024-01-01 00:00:00', 0, 0), +(3, 'DEV', '研发部', 2, 1, 1, 'system', '2024-01-01 00:00:00', 'system', '2024-01-01 00:00:00', 0, 0), +(4, 'TEST', '测试部', 2, 2, 1, 'system', '2024-01-01 00:00:00', 'system', '2024-01-01 00:00:00', 0, 0), +(5, 'OPS', '运维部', 2, 3, 1, 'system', '2024-01-01 00:00:00', 'system', '2024-01-01 00:00:00', 0, 0), + +-- 人力资源部门 +(6, 'HR', '人力资源部', 1, 2, 1, 'system', '2024-01-01 00:00:00', 'system', '2024-01-01 00:00:00', 0, 0), +(7, 'REC', '招聘部', 6, 1, 1, 'system', '2024-01-01 00:00:00', 'system', '2024-01-01 00:00:00', 0, 0), +(8, 'TRAIN', '培训部', 6, 2, 1, 'system', '2024-01-01 00:00:00', 'system', '2024-01-01 00:00:00', 0, 0), + +-- 其他部门 +(9, 'FIN', '财务部', 1, 3, 1, 'system', '2024-01-01 00:00:00', 'system', '2024-01-01 00:00:00', 0, 0), +(10, 'MKT', '市场部', 1, 4, 1, 'system', '2024-01-01 00:00:00', 'system', '2024-01-01 00:00:00', 0, 0), +(11, 'SALES', '销售部', 10, 1, 1, 'system', '2024-01-01 00:00:00', 'system', '2024-01-01 00:00:00', 0, 0), +(12, 'PR', '公关部', 10, 2, 1, 'system', '2024-01-01 00:00:00', 'system', '2024-01-01 00:00:00', 0, 0); -- 系统管理菜单按钮权限 INSERT INTO sys_menu (id, create_by, create_time, deleted, update_by, update_time, version,