Browse Source

用户添加职位

wanggaokun 3 weeks ago
parent
commit
1a417b57a4

+ 5 - 0
eco-nexus-core/nexus-core-biz/src/main/java/org/eco/vip/nexus/core/domain/user/User.java

@@ -38,6 +38,11 @@ public class User extends BaseEntity {
      */
     private String orgId;
 
+    /**
+     * 职位ID
+     */
+    private String positionId;
+
     /**
      * 用户账号
      */

+ 5 - 0
eco-nexus-core/nexus-core-biz/src/main/java/org/eco/vip/nexus/core/domain/user/pojo/UserBO.java

@@ -33,6 +33,11 @@ public class UserBO extends BaseBO {
      */
     private String orgId;
 
+    /**
+     * 职位ID
+     */
+    private String positionId;
+
     /**
      * 用户账号
      */

+ 18 - 0
eco-nexus-core/nexus-core-biz/src/main/java/org/eco/vip/nexus/core/domain/user/pojo/UserVO.java

@@ -7,6 +7,7 @@ package org.eco.vip.nexus.core.domain.user.pojo;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.mybatisflex.annotation.RelationOneToOne;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -35,6 +36,23 @@ public class UserVO extends BaseEntity {
      */
     private String orgId;
 
+    /**
+     * 组织ID
+     */
+    @RelationOneToOne(selfField = "orgId", targetTable = "system_org_t", targetField = "orgId", valueField = "name")
+    private String orgName;
+
+    /**
+     * 职位ID
+     */
+    private String positionId;
+
+    /**
+     * 职位名称
+     */
+    @RelationOneToOne(selfField = "positionId", targetTable = "system_position_t", targetField = "positionId", valueField = "name")
+    private String positionName;
+
     /**
      * 用户账号
      */

+ 2 - 1
eco-start/src/main/resources/db/mysql/V1_0_0_1__sys-init-ddl.sql

@@ -285,6 +285,7 @@ CREATE TABLE `system_user_t`
 (
     `user_id`      varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '唯一标识',
     `org_id`       varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '组织ID',
+    `position_id`  varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '职位ID',
     `account`      varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '用户账号',
     `user_name`    varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '用户姓名',
     `nick_name`    varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '用户昵称',
@@ -313,7 +314,7 @@ CREATE TABLE `system_user_t`
 -- Records of system_user_t
 -- ----------------------------
 INSERT INTO `system_user_t`
-VALUES ('1', '', 'superadmin', '超级管理员', 'eco', 'pc_user', NULL, NULL, NULL, NULL,
+VALUES ('1', '', NULL, 'superadmin', '超级管理员', 'eco', 'pc_user', NULL, NULL, NULL, NULL,
         '$2a$10$0dvrBO4B.yyfbLsO3OcDUOaaRf8XklJG6Tyn.6fh907KtxBpzvwo6', NULL, NULL, '1', '1', '1', 0, '0', '1',
         '2025-07-10 14:55:25', '1', '2025-07-10 14:55:21', NULL);