Commit Graph

838 Commits (feature/jingyou)
 

Author SHA1 Message Date
dxfeng 46d8e99088 优化代码逻辑,去除map表交互,提升人员导入速度 7 months ago
dxfeng bbf8408bb4 组织透视图,岗位数据查询BUG修复 9 months ago
dxfeng 7d0c7282b8 组织透视图,岗位数据查询BUG修复 9 months ago
dxfeng 5822b37375 组织透视图,穿透BUG修复 10 months ago
dxfeng 707aa00417 岗位列表树,展示顺序问题处理 10 months ago
dxfeng 16a23e9e39 晶优组织架构图重写 10 months ago
dxfeng 8d9303f07c 晶优组织架构图重写 10 months ago
dxfeng 28884f06a9 晶优组织架构图重写 11 months ago
dxfeng ffc9a89cd1 晶优二开,编制信息导出 2 years ago
dxfeng 31436b195e 晶优二开,编制信息导出 2 years ago
dxfeng 0f84ffa2e0 晶优二开,编制信息导出 2 years ago
dxfeng 33c02ec78e 组织架构图、集团负责人展示 3 years ago
dxfeng 1a47555a80 组织架构图搜索BUG修复 3 years ago
dxfeng ab61cde4a7 组织架构图编制、在岗数据刷新 3 years ago
dxfeng c3e73c2b44 独立项目分支。由dev分支回退、BUG修复 3 years ago
dxfeng 5715a02a47 独立项目分支。由dev分支回退、BUG修复 3 years ago
dxfeng 47b8f651a9 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/jingyou 3 years ago
dxfeng 6c15f7fc3c Merge pull request '分权BUG修复' (#41) from feature/dxf into develop
Reviewed-on: #41
3 years ago
dxfeng df0d688e6f 分权BUG修复 3 years ago
dxfeng 31645b34fe 分权BUG修复 3 years ago
dxfeng 7988cf6c2a Merge pull request '组织架构图,不展示手机、地址、部门' (#40) from feature/dxf into develop
Reviewed-on: #40
3 years ago
dxfeng ffe09c8933 组织架构图,不展示手机、地址、部门 3 years ago
dxfeng 6323829baf Merge pull request '分权BUG修复' (#39) from feature/dxf into develop
Reviewed-on: #39
3 years ago
dxfeng 85e39fd564 分权BUG修复 3 years ago
dxfeng 6588cbd405 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 3 years ago
‘ml’ 52f9e756e6 组织透视图虚拟组织修复 3 years ago
dxfeng 3028ae8335 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 3 years ago
dxfeng 9b36018c9a Merge pull request '分权BUG修复' (#38) from feature/dxf into develop
Reviewed-on: #38
3 years ago
dxfeng 373eebe5d8 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 3 years ago
dxfeng 47aafefa5a 分权BUG修复 3 years ago
‘ml’ 5e981c8163 Merge remote-tracking branch 'origin/develop' into feature/ml 3 years ago
‘ml’ 7d88bb9d5b 虚拟组织(新增修改删除接口) 3 years ago
liang.cheng 41370fe770 Merge pull request '人员卡片权限接口' (#37) from feature/cl into develop
Reviewed-on: #37
3 years ago
Chengliang afcbbcefb1 人员卡片权限接口 3 years ago
dxfeng d743cafac0 Merge pull request '聚才林岗位分权' (#36) from feature/dxf into develop
Reviewed-on: #36
3 years ago
dxfeng 18767b722c 聚才林岗位分权 3 years ago
dxfeng a85cc10aab Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 3 years ago
‘ml’ 1992c1375d Merge remote-tracking branch 'origin/develop' into feature/ml
# Conflicts:
#	src/com/engine/organization/service/impl/OrgChartServiceImpl.java
3 years ago
‘ml’ 8d78af3e14 虚拟组织建模表数据写入map 3 years ago
liang.cheng 121927dba8 Merge pull request '人员卡片类型权限' (#35) from feature/cl into develop
Reviewed-on: #35
3 years ago
Chengliang b636dc2b82 人员卡片类型权限 3 years ago
dxfeng f6779ec20a Merge pull request '组织架构图分权功能' (#34) from feature/dxf into develop
Reviewed-on: #34
3 years ago
dxfeng c42ac59eaf Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 3 years ago
dxfeng be90013ca0 组织架构图分权功能 3 years ago
liang.cheng ac5eb30534 Merge pull request '人员卡片权限' (#33) from feature/cl into develop
Reviewed-on: #33
3 years ago
Chengliang 4e4cf54f8a 人员卡片权限 3 years ago
dxfeng 796487941c Merge pull request '分部、部门、岗位、人员 分权功能开发' (#32) from feature/dxf into develop
Reviewed-on: #32
3 years ago
dxfeng 895528617b 分部、部门、岗位、人员 分权功能开发 3 years ago
dxfeng 955134dc28 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
 Conflicts:
	src/com/engine/organization/service/impl/ManagerDetachServiceImpl.java
3 years ago
liang.cheng 73f3fac3b2 Merge pull request '分权开关设置' (#31) from feature/cl into develop
Reviewed-on: #31
3 years ago