 dxfeng
|
b446dbdb53
|
人员导入、花名册左侧树BUG修复
|
3 years ago |
‘ml’
|
f30998351f
|
Merge remote-tracking branch 'origin/develop' into feature/ml
# Conflicts:
# src/com/engine/organization/thread/CompanyTriggerRunnable.java
# src/com/engine/organization/thread/DepartmentTriggerRunnable.java
|
3 years ago |
|
‘ml’
|
65ccecce56
|
分部、部门、岗位禁用修复1024
|
3 years ago |
|
dxfeng
|
dca18ea5b1
|
编制导入模板、人员卡片、组织架构图Oracle
|
3 years ago |
|
dxfeng
|
3b4c59ae8c
|
人员相关BUG修复
|
3 years ago |
|
dxfeng
|
2515121d83
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
3 years ago |
|
dxfeng
|
11a4a85ff1
|
人员关联调整
|
3 years ago |
|
‘ml’
|
05fe14b5e1
|
分部转移、部门转移、岗位合并修复1021
|
3 years ago |
|
‘ml’
|
887a1eafe3
|
Merge remote-tracking branch 'origin/develop' into feature/ml
|
3 years ago |
|
dxfeng
|
52c8b86adb
|
人员关联调整
|
3 years ago |
|
‘ml’
|
9a9b79cff0
|
Merge remote-tracking branch 'origin/develop' into feature/ml
|
3 years ago |
|
‘ml’
|
a0660a7857
|
分部转移、部门转移、岗位合并修复1020
|
3 years ago |
|
dxfeng
|
b7e34c1d31
|
人员关联调整
|
3 years ago |
|
dxfeng
|
a5687b3995
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
3 years ago |
|
‘ml’
|
adc92c8287
|
部门合并在岗数优化1019
|
3 years ago |
|
dxfeng
|
eb007f5b23
|
人事卡片BUG修复
|
3 years ago |
|
‘ml’
|
5005243758
|
部门合并在岗数优化
|
3 years ago |
|
dxfeng
|
414aefe41c
|
人事卡片BUG修复
|
3 years ago |
|
dxfeng
|
63b6b88a96
|
人员管理BUG修复
|
3 years ago |
|
dxfeng
|
396a4570d0
|
BUG修复
|
3 years ago |
|
dxfeng
|
cd4d2c77bf
|
人员卡片BUG修复
|
3 years ago |
|
dxfeng
|
f36756e1fd
|
分部、岗位 禁用功能限制
|
3 years ago |
|
dxfeng
|
4a85fc46aa
|
部门转移BUG修复
|
3 years ago |
|
dxfeng
|
1d7389c872
|
人员卡片
|
3 years ago |
|
dxfeng
|
f9c33da655
|
人员管理完善
|
3 years ago |
|
dxfeng
|
46068ab008
|
编制Action 添加提示信息，BUG修复
|
3 years ago |
|
dxfeng
|
c538a6205f
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
3 years ago |
|
dxfeng
|
3ac7c2b959
|
聚才林花名册
|
3 years ago |
|
dxfeng
|
f26159506a
|
岗位浏览按钮、编制action BUG修复
|
3 years ago |
|
‘ml’
|
c78f2157f8
|
层级显示不一致优化
|
3 years ago |
 Chengliang
|
eb5578fd64
|
编制删除
|
3 years ago |
|
dxfeng
|
9df3349715
|
兼容EC岗位名称重复
|
3 years ago |
|
dxfeng
|
231addfda1
|
人事卡片接口开发
|
3 years ago |
|
dxfeng
|
284f778963
|
人员调整,在岗数关联优化
|
3 years ago |
|
dxfeng
|
acee0bad51
|
人员调整,在岗数关联优化
|
3 years ago |
|
dxfeng
|
c6fb0d129b
|
组织架构图编制、在岗,数据优化
|
3 years ago |
|
Chengliang
|
ca3a093357
|
bug
|
3 years ago |
|
dxfeng
|
02836ce37d
|
岗位名称校验、编制展示优化、BUG修复
|
3 years ago |
|
dxfeng
|
92d9a17d8c
|
组织架构图编制显示优化
|
3 years ago |
|
dxfeng
|
106d7e8bb8
|
更新人员、编制 同步组织架构图
|
3 years ago |
|
dxfeng
|
7eb7a93397
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
3 years ago |
|
dxfeng
|
a847a4efef
|
兼容Oracle,达梦
|
3 years ago |
|
dxfeng
|
8a9370ee9e
|
BUG修复
|
3 years ago |
|
Chengliang
|
61aabb4ca1
|
测试
|
3 years ago |
|
dxfeng
|
38725f97b0
|
BUG修复
|
3 years ago |
|
dxfeng
|
2632f6c857
|
BUG修复
|
3 years ago |
|
dxfeng
|
b214ec8509
|
BUG修复
|
3 years ago |
|
dxfeng
|
fe668c37e7
|
BUG修复
|
3 years ago |
|
dxfeng
|
c49abcf77f
|
BUG修复
|
3 years ago |
|
dxfeng
|
c8eb2f3451
|
BUG修复
|
3 years ago |
|
dxfeng
|
1b4d7203b8
|
BUG修复
|
3 years ago |
|
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 |
