Commit Graph

528 Commits (13345f7c50db9f694c4889c3e39bb779f7c9f8f9)

Author SHA1 Message Date
dxfeng fa1434a64a 卡片分组权限 2 years ago
dxfeng dcf8418edb 代码还原 2 years ago
dxfeng 0e41f08327 组织架构图搜索下拉框、集团负责人BUG修复 2 years ago
dxfeng 466ba43b31 人员卡片类别展示权限控制 2 years ago
dxfeng a6952f41b0 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2 years ago
dxfeng b0021dae20 字段允许个人修改 2 years ago
liang.cheng c2a1908c10 Merge pull request 'bug修复' (#44) from feature/cl into develop
Reviewed-on: #44
2 years ago
Chengliang 99f849f350 bug修复 2 years ago
dxfeng a3a0ce8046 岗位按钮、人员字段权限 2 years ago
dxfeng 3813c8b54a Merge pull request '岗位按钮、组织架构图 BUG修复' (#43) from feature/dxf into develop
Reviewed-on: #43
2 years ago
dxfeng 9a163f1742 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2 years ago
dxfeng c03a7c599a 岗位按钮、组织架构图 BUG修复 2 years ago
‘ml’ a82a41bf64 修复组织机构图虚拟组织不显示 2 years ago
liang.cheng a5295a68cf Merge pull request '人员卡片菜单权限接口' (#42) from feature/cl into develop
Reviewed-on: #42
2 years ago
Chengliang dc347c755d 人员卡片菜单权限接口 2 years ago
‘ml’ b9ff329ceb 虚拟组织(建模)删除接口优化 2 years ago
dxfeng df0d688e6f 分权BUG修复 3 years ago
dxfeng 31645b34fe 分权BUG修复 3 years ago
dxfeng ffe09c8933 组织架构图,不展示手机、地址、部门 3 years ago
dxfeng 85e39fd564 分权BUG修复 3 years ago
‘ml’ 52f9e756e6 组织透视图虚拟组织修复 3 years ago
dxfeng 9b36018c9a Merge pull request '分权BUG修复' (#38) from feature/dxf into develop
Reviewed-on: #38
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 18767b722c 聚才林岗位分权 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 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 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
dxfeng 0b3cd0641b 分权开发 3 years ago
Chengliang 1e08772a9d 分权开关设置 3 years ago
dxfeng 40f1f097e6 代码合并 3 years ago
liang.cheng 19cccb9345 Merge pull request 'feature/detach' (#29) from feature/detach into develop
Reviewed-on: #29
3 years ago
dxfeng 3989161281 组织架构图相关BUG修复 3 years ago
Chengliang 47c64b6797 模块管理分权 3 years ago
Chengliang ef392f4d0a 模块管理分权 3 years ago
‘ml’ 1be79b9698 分部、部门、岗位禁用修复1024 3 years ago
‘ml’ 939e6c7607 分部转移、部门转移、岗位合并修复1021 3 years ago
Chengliang 96cefec891 模块管理分权 3 years ago
Chengliang f6ea4425cf 模块管理分权 3 years ago
Chengliang 4c74b583bf 模块管理分权 3 years ago