From 455bf65a36ce1e9b6c24eb5c86a8eb69eaea8003 Mon Sep 17 00:00:00 2001
From: yijiusmile <253281376@qq.com>
Date: 星期四, 04 三月 2021 00:19:47 +0800
Subject: [PATCH] 增加员工基本信息，工作经历的关联查询
---
febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/impl/DeptServiceImpl.java | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/impl/DeptServiceImpl.java b/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/impl/DeptServiceImpl.java
index 9618758..a90b52a 100644
--- a/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/impl/DeptServiceImpl.java
+++ b/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/impl/DeptServiceImpl.java
@@ -1,5 +1,6 @@
package cc.mrbird.febs.server.system.service.impl;
+import cc.mrbird.febs.common.core.constant.ModuleCode;
import cc.mrbird.febs.common.core.entity.DeptTree;
import cc.mrbird.febs.common.core.entity.QueryRequest;
import cc.mrbird.febs.common.core.entity.Tree;
@@ -7,6 +8,7 @@
import cc.mrbird.febs.common.core.entity.constant.PageConstant;
import cc.mrbird.febs.common.core.entity.system.Dept;
import cc.mrbird.febs.common.core.entity.system.DicItem;
+import cc.mrbird.febs.common.core.utils.SequenceUtil;
import cc.mrbird.febs.common.core.utils.SortUtil;
import cc.mrbird.febs.common.core.utils.TreeUtil;
import cc.mrbird.febs.common.redis.service.RedisService;
@@ -75,6 +77,7 @@
@Override
@Transactional(rollbackFor = Exception.class)
public void createDept(Dept dept) {
+ dept.setDeptId(SequenceUtil.generateId(0L, ModuleCode.FRAM_SYSTEM));
if (dept.getParentId() == null) {
dept.setParentId(Dept.TOP_DEPT_ID);
}
@@ -124,6 +127,8 @@
tree.setParentId(dept.getParentId().toString());
tree.setLabel(dept.getDeptName());
tree.setOrderNum(dept.getOrderNum());
+ tree.setDeptFunction(dept.getDeptFunction());
+ tree.setDeptType(dept.getDeptType());
trees.add(tree);
});
}
--
Gitblit v1.8.0