Commit Graph

460 Commits (594173175cf78a784258658000bcf113417232df)

Author SHA1 Message Date
dxfeng b494a6a96e BUG修复 3 years ago
dxfeng 29295bb464 BUG修复 3 years ago
dxfeng 4b3bb0d5f3 编制导入 3 years ago
dxfeng 16fcd76468 编制导入 3 years ago
dxfeng 50e5c7312e 编制导入 3 years ago
dxfeng 8b7b75b57b Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf 3 years ago
dxfeng 35439a442f BUG 修复 3 years ago
Chengliang fbd608a52a 顶部按钮修改 3 years ago
dxfeng 76b9cd2a89 部门复制 3 years ago
dxfeng 34d44b6c91 部门复制 3 years ago
dxfeng 8e385537da BUG修复 3 years ago
dxfeng 5c66744468 部门合并、组织导入 3 years ago
dxfeng f6c41a3467 部门合并重写 3 years ago
Chengliang 6de1b0746f 修复富文本长度 3 years ago
dxfeng 0a87a2ad4d Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf 3 years ago
dxfeng 91a8ad0bd3 导入BUG 3 years ago
Chengliang c280c5f908 fixed 3 years ago
dxfeng 59f76c012c 触发器,分部、部门赋值,SQL脚本 3 years ago
dxfeng 34af4f95c9 Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf 3 years ago
dxfeng 79c5f94862 导入问题处理 3 years ago
dxfeng 120b4efdba 不同等级方案、编号可重复 3 years ago
Chengliang 8553e37c22 fixed 3 years ago
Chengliang 1c900eafc9 Merge remote-tracking branch 'origin/develop' into feature/cl
# Conflicts:
#	src/com/engine/organization/service/impl/CompServiceImpl.java
3 years ago
dxfeng 6765fd8fc4 左侧树排序 3 years ago
Chengliang ba0b31f086 fixed 3 years ago
dxfeng 900ded1aad 表结构更新 3 years ago
dxfeng 278d61c499 Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf 3 years ago
Chengliang 3e06077e2a fixed 3 years ago
dxfeng 6c04ffd384 编制管理 3 years ago
dxfeng 6415ee3eb7 编制方案 3 years ago
dxfeng d65551c0ee 复制BUG修复 3 years ago
dxfeng b1b2a9a88a 部门管理,更新为EC 3 years ago
dxfeng 4fa38f704c 分部管理,更新为EC 3 years ago
dxfeng f05cf6da8f BUG修复 3 years ago
reset 38a1fca585
!224 bug修复
Merge pull request !224 from reset/feature/cl
3 years ago
Chengliang 0ffb0bac33 fix 3 years ago
dxfeng 337f8e51ed Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf 3 years ago
dxfeng 989526bc26 使用状态BUG修复 3 years ago
Chengliang 819a053aa3 fixed 3 years ago
Chengliang f5fcbdaff8 列表宽度顺序调整 3 years ago
reset 385ff8331e
!220 fixed
Merge pull request !220 from reset/feature/cl
3 years ago
Chengliang 3eb29f823f fixed 3 years ago
dxfeng 09d624b46b
!219 触发器、非标开关
Merge pull request !219 from dxfeng/feature/dxf
3 years ago
dxfeng 489ad2fdd0 Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf 3 years ago
dxfeng b49a25742a 触发器、非标开关 3 years ago
Chengliang 80d3202c70 fixed 3 years ago
Chengliang b5b90a6403 修复组织架构图跳转问题 3 years ago
dxfeng 1f7f299368 分部、部门、岗位触发器 3 years ago
dxfeng 56ed6aa197 BUG修复 3 years ago
dxfeng 21dc07dd40 BUG修复 3 years ago
dxfeng 5dc920e364 人员信息分类 3 years ago
dxfeng cfc78875c6 人员信息分类 3 years ago
dxfeng b6caffc74f 人员信息分类 删除接口 3 years ago
dxfeng 2744f85eff BUG修复 3 years ago
dxfeng 532a6d00ce 人员信息分类 3 years ago
dxfeng 6351109b79 人员信息分类 3 years ago
dxfeng f82e679837 Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf 3 years ago
dxfeng 8968e44e09 分部、部门、岗位同步EC重写 3 years ago
Chengliang 6bfc6eae27 人员信息管理 3 years ago
Chengliang ca7d34a5bd 人员信息模块 3 years ago
reset 776d60674b
!207 fixed
Merge pull request !207 from reset/feature/cl
3 years ago
Chengliang c8bf27880a fixed 3 years ago
Chengliang 8043012b41 人基础员信息 3 years ago
dxfeng 0d9cbe7ff5 BUG修复 3 years ago
dxfeng 07dabf46a0 BUG修复 3 years ago
dxfeng fb5eea214b BUG修复 3 years ago
dxfeng 564b30eed8 BUG修复 3 years ago
dxfeng 477a2f3bce 自定义字段BUG修复 3 years ago
dxfeng e135b02ed7
!201 BUG修复
Merge pull request !201 from dxfeng/feature/dxf
3 years ago
dxfeng ff8660a586 BUG修复 3 years ago
dxfeng 9c64467cc8 BUG修复 3 years ago
dxfeng b1ed914ebc BUG修复,权限控制 3 years ago
Chengliang 94ce6388e2 fixed 3 years ago
dxfeng ef6f21c636 BUG修复,权限控制 3 years ago
dxfeng 5cce107318 BUG修复,权限控制 3 years ago
dxfeng 3acec4730d BUG修复,权限控制 3 years ago
dxfeng e3207f2996 BUG修复 3 years ago
dxfeng ea64d13503 BUG修复 3 years ago
dxfeng e0b09bde52 BUG修复 3 years ago
dxfeng cdafa11668 兼容Oracle 3 years ago
dxfeng e4d9d80fee 兼容Oracle 3 years ago
dxfeng 1318fc1aba BUG修复 3 years ago
dxfeng 05c24b5e98 Oracle BUG修复 3 years ago
dxfeng 3e6a4acf8c Oracle BUG修复 3 years ago
dxfeng f27612db94 Oracle BUG修复 3 years ago
dxfeng abc470935e
!188 BUG修复
Merge pull request !188 from dxfeng/feature/dxf
3 years ago
dxfeng 6576335c6c BUG修复 3 years ago
reset ad5cfbb527
!187 fix
Merge pull request !187 from reset/feature/cl
3 years ago
Chengliang fef2717962 组织架构图查询条件 3 years ago
dxfeng 08a9ab7b0d BUG修复 3 years ago
dxfeng 48861cdace BUG修复 3 years ago
dxfeng 68ae1c03fd BUG修复 3 years ago
dxfeng 36ce009929 非标脚本完善,BUG修复 3 years ago
dxfeng 5779beacff 非标脚本完善,BUG修复 3 years ago
dxfeng 0e3fc1a238 同步CusFieldData数据接口 3 years ago
dxfeng ceb3484d6d 编制方案需求完善 3 years ago
dxfeng 1c9b1abe69 编制方案需求完善 3 years ago
dxfeng 7b88ba5a78 编制方案需求完善 3 years ago
dxfeng 6c91c3d41d BUG修复 3 years ago
dxfeng 46ab51ee18 人员导入、CusFieldData触发器调整 3 years ago