Commit Graph

422 Commits

Author SHA1 Message Date
dxfeng 106d7e8bb8 更新人员、编制 同步组织架构图 2022-09-21 16:23:09 +08:00
dxfeng 7eb7a93397 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2022-09-21 10:45:26 +08:00
dxfeng a847a4efef 兼容Oracle,达梦 2022-09-21 10:43:41 +08:00
dxfeng 8a9370ee9e BUG修复 2022-09-20 18:46:05 +08:00
Chengliang 61aabb4ca1 测试 2022-09-20 14:24:26 +08:00
dxfeng 38725f97b0 BUG修复 2022-09-20 14:19:46 +08:00
dxfeng 2632f6c857 BUG修复 2022-09-20 10:25:13 +08:00
dxfeng b214ec8509 BUG修复 2022-09-20 09:18:24 +08:00
dxfeng fe668c37e7 BUG修复 2022-09-19 13:27:50 +08:00
dxfeng c49abcf77f BUG修复 2022-09-16 16:56:30 +08:00
dxfeng c8eb2f3451 BUG修复 2022-09-16 14:48:00 +08:00
dxfeng 1b4d7203b8 BUG修复 2022-09-16 11:28:47 +08:00
dxfeng b494a6a96e BUG修复 2022-09-16 11:01:31 +08:00
dxfeng 29295bb464 BUG修复 2022-09-16 10:22:15 +08:00
dxfeng 4b3bb0d5f3 编制导入 2022-09-15 18:40:05 +08:00
dxfeng 16fcd76468 编制导入 2022-09-15 18:31:11 +08:00
dxfeng 50e5c7312e 编制导入 2022-09-15 16:51:35 +08:00
dxfeng 8b7b75b57b Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf 2022-09-15 10:43:38 +08:00
dxfeng 35439a442f BUG 修复 2022-09-15 10:41:04 +08:00
Chengliang fbd608a52a 顶部按钮修改 2022-09-14 17:14:12 +08:00
dxfeng 76b9cd2a89 部门复制 2022-09-09 15:29:21 +08:00
dxfeng 34d44b6c91 部门复制 2022-09-09 14:41:04 +08:00
dxfeng 8e385537da BUG修复 2022-09-09 10:25:57 +08:00
dxfeng 5c66744468 部门合并、组织导入 2022-09-08 17:54:46 +08:00
dxfeng f6c41a3467 部门合并重写 2022-09-08 15:36:47 +08:00
Chengliang 6de1b0746f 修复富文本长度 2022-09-08 10:41:04 +08:00
dxfeng 0a87a2ad4d Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf 2022-09-07 19:17:10 +08:00
dxfeng 91a8ad0bd3 导入BUG 2022-09-07 19:12:47 +08:00
Chengliang c280c5f908 fixed 2022-09-07 19:12:42 +08:00
dxfeng 59f76c012c 触发器,分部、部门赋值,SQL脚本 2022-09-07 15:40:19 +08:00
dxfeng 34af4f95c9 Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf 2022-09-06 17:23:57 +08:00
dxfeng 79c5f94862 导入问题处理 2022-09-06 17:23:44 +08:00
dxfeng 120b4efdba 不同等级方案、编号可重复 2022-09-06 15:38:16 +08:00
Chengliang 8553e37c22 fixed 2022-09-06 15:31:24 +08:00
Chengliang 1c900eafc9 Merge remote-tracking branch 'origin/develop' into feature/cl
# Conflicts:
#	src/com/engine/organization/service/impl/CompServiceImpl.java
2022-09-06 15:30:09 +08:00
dxfeng 6765fd8fc4 左侧树排序 2022-09-06 15:19:16 +08:00
Chengliang ba0b31f086 fixed 2022-09-06 14:26:09 +08:00
dxfeng 900ded1aad 表结构更新 2022-09-06 14:01:01 +08:00
dxfeng 278d61c499 Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf 2022-09-06 10:51:35 +08:00
Chengliang 3e06077e2a fixed 2022-09-06 10:34:23 +08:00
dxfeng 6c04ffd384 编制管理 2022-09-06 10:33:46 +08:00
dxfeng 6415ee3eb7 编制方案 2022-09-06 09:45:56 +08:00
dxfeng d65551c0ee 复制BUG修复 2022-09-05 18:33:20 +08:00
dxfeng b1b2a9a88a 部门管理,更新为EC 2022-09-05 17:25:11 +08:00
dxfeng 4fa38f704c 分部管理,更新为EC 2022-09-05 15:58:46 +08:00
dxfeng f05cf6da8f BUG修复 2022-09-05 10:51:08 +08:00
reset 38a1fca585
!224 bug修复
Merge pull request !224 from reset/feature/cl
2022-09-02 09:49:26 +00:00
Chengliang 0ffb0bac33 fix 2022-09-02 17:48:14 +08:00
dxfeng 337f8e51ed Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf 2022-09-02 17:32:14 +08:00
dxfeng 989526bc26 使用状态BUG修复 2022-09-02 17:31:44 +08:00