liang.cheng
/
weaver-hrm-organization
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
750 Commits 23 Branches 0 Tags 6.7 MiB
Commit Graph

458 Commits

Author SHA1 Message Date
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
Chengliang 819a053aa3 fixed 2022-09-02 16:17:01 +08:00
Chengliang f5fcbdaff8 列表宽度顺序调整 2022-09-02 11:23:16 +08:00
reset 385ff8331e
!220 fixed 
Merge pull request !220 from reset/feature/cl
 2022-09-01 09:05:18 +00:00
Chengliang 3eb29f823f fixed 2022-09-01 17:03:45 +08:00
dxfeng 09d624b46b
!219 触发器、非标开关 
Merge pull request !219 from dxfeng/feature/dxf
 2022-09-01 09:02:15 +00:00
dxfeng 489ad2fdd0 Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf 2022-09-01 17:00:38 +08:00
dxfeng b49a25742a 触发器、非标开关 2022-09-01 16:57:06 +08:00
Chengliang 80d3202c70 fixed 2022-09-01 13:49:21 +08:00
Chengliang b5b90a6403 修复组织架构图跳转问题 2022-09-01 10:16:58 +08:00
dxfeng 1f7f299368 分部、部门、岗位触发器 2022-08-31 14:24:00 +08:00
dxfeng 56ed6aa197 BUG修复 2022-08-30 10:46:42 +08:00
dxfeng 21dc07dd40 BUG修复 2022-08-29 17:07:34 +08:00
dxfeng 5dc920e364 人员信息分类 2022-08-29 15:39:35 +08:00
dxfeng cfc78875c6 人员信息分类 2022-08-29 14:26:10 +08:00
dxfeng b6caffc74f 人员信息分类 删除接口 2022-08-29 14:12:06 +08:00
dxfeng 2744f85eff BUG修复 2022-08-29 11:07:10 +08:00
dxfeng 532a6d00ce 人员信息分类 2022-08-29 09:22:45 +08:00
dxfeng 6351109b79 人员信息分类 2022-08-26 17:36:26 +08:00
dxfeng f82e679837 Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf 2022-08-26 15:36:33 +08:00
dxfeng 8968e44e09 分部、部门、岗位同步EC重写 2022-08-26 15:36:06 +08:00
Chengliang 6bfc6eae27 人员信息管理 2022-08-26 15:27:51 +08:00
Chengliang ca7d34a5bd 人员信息模块 2022-08-24 17:57:04 +08:00
reset 776d60674b
!207 fixed 
Merge pull request !207 from reset/feature/cl
 2022-08-24 01:54:09 +00:00
Chengliang c8bf27880a fixed 2022-08-24 09:53:07 +08:00
Chengliang 8043012b41 人基础员信息 2022-08-23 17:51:20 +08:00
dxfeng 0d9cbe7ff5 BUG修复 2022-08-23 17:43:09 +08:00
dxfeng 07dabf46a0 BUG修复 2022-08-22 18:56:27 +08:00
dxfeng fb5eea214b BUG修复 2022-08-22 15:32:42 +08:00
dxfeng 564b30eed8 BUG修复 2022-08-22 15:04:38 +08:00
dxfeng 477a2f3bce 自定义字段BUG修复 2022-08-22 13:35:21 +08:00
dxfeng e135b02ed7
!201 BUG修复 
Merge pull request !201 from dxfeng/feature/dxf
 2022-08-22 01:10:41 +00:00
dxfeng ff8660a586 BUG修复 2022-08-22 09:10:00 +08:00
dxfeng 9c64467cc8 BUG修复 2022-08-19 10:37:05 +08:00
dxfeng b1ed914ebc BUG修复，权限控制 2022-08-19 10:28:17 +08:00
Chengliang 94ce6388e2 fixed 2022-08-18 17:41:05 +08:00
dxfeng ef6f21c636 BUG修复，权限控制 2022-08-18 15:17:59 +08:00
dxfeng 5cce107318 BUG修复，权限控制 2022-08-18 14:27:16 +08:00
dxfeng 3acec4730d BUG修复，权限控制 2022-08-17 19:29:46 +08:00
dxfeng e3207f2996 BUG修复 2022-08-17 13:34:29 +08:00
dxfeng ea64d13503 BUG修复 2022-08-17 09:28:04 +08:00
dxfeng e0b09bde52 BUG修复 2022-08-12 16:35:53 +08:00
dxfeng cdafa11668 兼容Oracle 2022-08-12 14:09:10 +08:00
dxfeng e4d9d80fee 兼容Oracle 2022-08-12 10:12:55 +08:00
dxfeng 1318fc1aba BUG修复 2022-08-12 09:34:19 +08:00
dxfeng 05c24b5e98 Oracle BUG修复 2022-08-11 15:14:54 +08:00
dxfeng 3e6a4acf8c Oracle BUG修复 2022-08-11 11:17:41 +08:00
dxfeng f27612db94 Oracle BUG修复 2022-08-11 10:43:52 +08:00
dxfeng abc470935e
!188 BUG修复 
Merge pull request !188 from dxfeng/feature/dxf
 2022-08-10 07:38:04 +00:00
dxfeng 6576335c6c BUG修复 2022-08-10 15:37:23 +08:00
reset ad5cfbb527
!187 fix 
Merge pull request !187 from reset/feature/cl
 2022-08-10 07:37:22 +00:00
Chengliang fef2717962 组织架构图查询条件 2022-08-10 15:35:43 +08:00
dxfeng 08a9ab7b0d BUG修复 2022-08-10 15:25:34 +08:00
dxfeng 48861cdace BUG修复 2022-08-08 08:55:24 +08:00
dxfeng 68ae1c03fd BUG修复 2022-08-05 15:21:56 +08:00
dxfeng 36ce009929 非标脚本完善，BUG修复 2022-08-04 10:29:29 +08:00
dxfeng 5779beacff 非标脚本完善，BUG修复 2022-08-03 18:35:42 +08:00
dxfeng 0e3fc1a238 同步CusFieldData数据接口 2022-08-02 16:25:21 +08:00
dxfeng ceb3484d6d 编制方案需求完善 2022-08-02 15:10:36 +08:00
dxfeng 1c9b1abe69 编制方案需求完善 2022-08-02 14:42:25 +08:00
dxfeng 7b88ba5a78 编制方案需求完善 2022-08-02 13:39:47 +08:00
dxfeng 6c91c3d41d BUG修复 2022-08-01 18:34:20 +08:00
dxfeng 46ab51ee18 人员导入、CusFieldData触发器调整 2022-08-01 17:03:13 +08:00
dxfeng ceba6b5d62 BUG修复 2022-08-01 09:09:39 +08:00
dxfeng 0a47b3548d 人员导入 2022-07-29 16:20:59 +08:00