Commit Graph

522 Commits

Author SHA1 Message Date
dxfeng fa1434a64a 卡片分组权限 2022-11-10 10:28:14 +08:00
dxfeng dcf8418edb 代码还原 2022-11-10 10:24:48 +08:00
dxfeng 0e41f08327 组织架构图搜索下拉框、集团负责人BUG修复 2022-11-09 18:50:39 +08:00
dxfeng 466ba43b31 人员卡片类别展示权限控制 2022-11-09 16:58:09 +08:00
dxfeng a6952f41b0 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2022-11-09 11:13:55 +08:00
dxfeng b0021dae20 字段允许个人修改 2022-11-09 11:07:55 +08:00
liang.cheng c2a1908c10 Merge pull request 'bug修复' (#44) from feature/cl into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/44
2022-11-09 09:54:03 +08:00
Chengliang 99f849f350 bug修复 2022-11-09 09:45:19 +08:00
dxfeng a3a0ce8046 岗位按钮、人员字段权限 2022-11-08 17:26:59 +08:00
dxfeng 3813c8b54a Merge pull request '岗位按钮、组织架构图 BUG修复' (#43) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/43
2022-11-08 15:26:13 +08:00
dxfeng 9a163f1742 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2022-11-08 15:21:51 +08:00
dxfeng c03a7c599a 岗位按钮、组织架构图 BUG修复 2022-11-08 15:21:29 +08:00
Chengliang dc347c755d 人员卡片菜单权限接口 2022-11-08 09:23:53 +08:00
dxfeng df0d688e6f 分权BUG修复 2022-11-03 16:51:56 +08:00
dxfeng 31645b34fe 分权BUG修复 2022-11-03 16:45:02 +08:00
dxfeng ffe09c8933 组织架构图,不展示手机、地址、部门 2022-11-03 14:54:14 +08:00
dxfeng 85e39fd564 分权BUG修复 2022-11-03 14:19:37 +08:00
dxfeng 373eebe5d8 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2022-11-03 11:11:04 +08:00
dxfeng 47aafefa5a 分权BUG修复 2022-11-03 11:06:36 +08:00
‘ml’ 5e981c8163 Merge remote-tracking branch 'origin/develop' into feature/ml 2022-11-02 20:19:16 +08:00
‘ml’ 7d88bb9d5b 虚拟组织(新增修改删除接口) 2022-11-02 20:18:55 +08:00
liang.cheng 41370fe770 Merge pull request '人员卡片权限接口' (#37) from feature/cl into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/37
2022-11-02 17:46:38 +08:00
Chengliang afcbbcefb1 人员卡片权限接口 2022-11-02 17:44:52 +08:00
dxfeng 18767b722c 聚才林岗位分权 2022-11-02 14:30:22 +08:00
liang.cheng 121927dba8 Merge pull request '人员卡片类型权限' (#35) from feature/cl into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/35
2022-11-02 11:31:54 +08:00
Chengliang b636dc2b82 人员卡片类型权限 2022-11-02 11:29:40 +08:00
dxfeng f6779ec20a Merge pull request '组织架构图分权功能' (#34) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/34
2022-11-02 11:00:18 +08:00
dxfeng be90013ca0 组织架构图分权功能 2022-11-02 10:55:15 +08:00
liang.cheng ac5eb30534 Merge pull request '人员卡片权限' (#33) from feature/cl into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/33
2022-11-01 17:55:07 +08:00
Chengliang 4e4cf54f8a 人员卡片权限 2022-11-01 17:53:31 +08:00
dxfeng 895528617b 分部、部门、岗位、人员 分权功能开发 2022-11-01 10:05:43 +08:00
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
2022-10-31 11:40:05 +08:00
dxfeng 0b3cd0641b 分权开发 2022-10-28 17:43:46 +08:00
Chengliang 1e08772a9d 分权开关设置 2022-10-28 17:41:56 +08:00
dxfeng 40f1f097e6 代码合并 2022-10-28 10:35:33 +08:00
liang.cheng 19cccb9345 Merge pull request 'feature/detach' (#29) from feature/detach into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/29
2022-10-28 09:36:40 +08:00
dxfeng 3989161281 组织架构图相关BUG修复 2022-10-27 19:11:58 +08:00
Chengliang 47c64b6797 模块管理分权 2022-10-27 15:06:50 +08:00
Chengliang ef392f4d0a 模块管理分权 2022-10-27 15:00:12 +08:00
‘ml’ 1be79b9698 分部、部门、岗位禁用修复1024 2022-10-27 15:00:07 +08:00
‘ml’ 939e6c7607 分部转移、部门转移、岗位合并修复1021 2022-10-27 14:59:57 +08:00
Chengliang 96cefec891 模块管理分权 2022-10-27 14:58:44 +08:00
Chengliang f6ea4425cf 模块管理分权 2022-10-27 14:58:44 +08:00
Chengliang 4c74b583bf 模块管理分权 2022-10-27 14:58:44 +08:00
Chengliang 2b975e6636 模块管理分权中心接口 2022-10-27 14:58:44 +08:00
dxfeng 92b246b5d5 组织架构图相关BUG修复 2022-10-27 14:39:35 +08:00
dxfeng 679c77f732 组织架构图相关BUG修复 2022-10-26 20:12:14 +08:00
dxfeng 7258ee742d 编制模板优化 2022-10-25 16:24:18 +08:00
dxfeng b2fc9d3e0c 人员编号、岗位部门、自定义下拉框BUG修复 2022-10-25 15:43:02 +08:00
dxfeng eeb21315c7 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2022-10-25 11:29:05 +08:00