 liang.cheng
|
c9b82b5f71
|
Merge pull request 'bug修复' (#56) from feature/cl into develop
Reviewed-on: #56
|
3 years ago |
|
Chengliang
|
d236127f31
|
bug修复
|
3 years ago |
‘ml’
|
091f202eac
|
职务导入
|
3 years ago |
|
liang.cheng
|
4e915f272b
|
Merge pull request 'sql' (#55) from feature/cl into develop
Reviewed-on: #55
|
3 years ago |
|
Chengliang
|
2bf63c689e
|
sql
|
3 years ago |
 dxfeng
|
7c5d6bfa19
|
Merge pull request '人员卡片按钮自定义' (#54) from feature/dxf into develop
Reviewed-on: #54
|
3 years ago |
|
dxfeng
|
854a40b7cd
|
人员卡片按钮自定义
|
3 years ago |
|
dxfeng
|
afc54c6d1e
|
Merge pull request '人员卡片按钮自定义' (#53) from feature/dxf into develop
Reviewed-on: #53
|
3 years ago |
|
dxfeng
|
b7217dae23
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
3 years ago |
|
dxfeng
|
d16f13405c
|
人员卡片按钮自定义
|
3 years ago |
|
‘ml’
|
1baf55e04f
|
职级职等导入更新
|
3 years ago |
|
‘ml’
|
33fe824cae
|
Merge remote-tracking branch 'origin/develop' into feature/ml
|
3 years ago |
|
‘ml’
|
9517ad15d6
|
优化职级模板字段顺序
|
3 years ago |
|
liang.cheng
|
003dd59cea
|
Merge pull request 'sql增加' (#52) from feature/cl into develop
Reviewed-on: #52
|
3 years ago |
|
Chengliang
|
94c1102c91
|
sql增加
|
3 years ago |
|
‘ml’
|
ba2434b130
|
Merge remote-tracking branch 'origin/develop' into feature/ml
|
3 years ago |
|
‘ml’
|
0459c628ea
|
职等职级导入接口20221111
|
3 years ago |
|
dxfeng
|
76081c3213
|
Merge pull request '人员卡片按钮权限' (#51) from feature/dxf into develop
Reviewed-on: #51
|
3 years ago |
|
dxfeng
|
57d788d807
|
人员卡片按钮权限
|
3 years ago |
|
liang.cheng
|
f2ea296832
|
Merge pull request 'bug修复' (#50) from feature/cl into develop
Reviewed-on: #50
|
3 years ago |
|
Chengliang
|
8e93568aa4
|
bug修复
|
3 years ago |
|
‘ml’
|
0da123fcef
|
Merge branch 'feature/ml' into develop
# Conflicts:
# src/com/engine/organization/service/impl/ImportCommonServiceImpl.java
|
3 years ago |
|
‘ml’
|
ec8be58a45
|
职等职级导入接口
|
3 years ago |
|
liang.cheng
|
8f7e9889a8
|
Merge pull request '接口' (#49) from feature/cl into develop
Reviewed-on: #49
|
3 years ago |
|
Chengliang
|
eeefde07ed
|
接口
|
3 years ago |
|
dxfeng
|
13345f7c50
|
Merge pull request '卡片分组权限' (#48) from feature/dxf into develop
Reviewed-on: #48
|
3 years ago |
|
dxfeng
|
fa1434a64a
|
卡片分组权限
|
3 years ago |
|
dxfeng
|
f1be7ad454
|
Merge pull request '代码还原' (#47) from feature/dxf into develop
Reviewed-on: #47
|
3 years ago |
|
dxfeng
|
dcf8418edb
|
代码还原
|
3 years ago |
|
dxfeng
|
8a5ce6ed96
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
3 years ago |
|
dxfeng
|
0e41f08327
|
组织架构图搜索下拉框、集团负责人BUG修复
|
3 years ago |
|
‘ml’
|
ddafc854b6
|
修复组织机构图虚拟组织不显示
|
3 years ago |
|
dxfeng
|
2b317e3d67
|
Merge pull request '岗位按钮 人员字段权限 人员卡片权限' (#45) from feature/dxf into develop
Reviewed-on: #45
|
3 years ago |
|
dxfeng
|
466ba43b31
|
人员卡片类别展示权限控制
|
3 years ago |
|
dxfeng
|
a6952f41b0
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
3 years ago |
|
dxfeng
|
b0021dae20
|
字段允许个人修改
|
3 years ago |
|
liang.cheng
|
c2a1908c10
|
Merge pull request 'bug修复' (#44) from feature/cl into develop
Reviewed-on: #44
|
3 years ago |
|
Chengliang
|
99f849f350
|
bug修复
|
3 years ago |
|
dxfeng
|
a3a0ce8046
|
岗位按钮、人员字段权限
|
3 years ago |
|
dxfeng
|
22fa6a60c7
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
3 years ago |
|
dxfeng
|
3813c8b54a
|
Merge pull request '岗位按钮、组织架构图 BUG修复' (#43) from feature/dxf into develop
Reviewed-on: #43
|
3 years ago |
|
dxfeng
|
9a163f1742
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
3 years ago |
|
dxfeng
|
c03a7c599a
|
岗位按钮、组织架构图 BUG修复
|
3 years ago |
|
‘ml’
|
a82a41bf64
|
修复组织机构图虚拟组织不显示
|
3 years ago |
|
liang.cheng
|
a5295a68cf
|
Merge pull request '人员卡片菜单权限接口' (#42) from feature/cl into develop
Reviewed-on: #42
|
3 years ago |
|
Chengliang
|
dc347c755d
|
人员卡片菜单权限接口
|
3 years ago |
|
‘ml’
|
b9ff329ceb
|
虚拟组织(建模)删除接口优化
|
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 |
|
dxfeng
|
0b3cd0641b
|
分权开发
|
3 years ago |
|
Chengliang
|
1e08772a9d
|
分权开关设置
|
3 years ago |
|
dxfeng
|
157217400f
|
Merge pull request '代码合并' (#30) from feature/dxf into develop
Reviewed-on: #30
|
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
|
2d40f6be3b
|
Merge pull request '组织架构图相关BUG修复' (#28) from feature/dxf into develop
Reviewed-on: #28
|
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 |
|
Chengliang
|
2b975e6636
|
模块管理分权中心接口
|
3 years ago |
|
dxfeng
|
19f3907807
|
Merge pull request '组织架构图相关BUG修复' (#27) from feature/dxf into develop
Reviewed-on: #27
|
3 years ago |
|
dxfeng
|
92b246b5d5
|
组织架构图相关BUG修复
|
3 years ago |
|
dxfeng
|
946a0006b4
|
Merge pull request '组织架构图相关BUG修复' (#26) from feature/dxf into develop
Reviewed-on: #26
|
3 years ago |
|
dxfeng
|
679c77f732
|
组织架构图相关BUG修复
|
3 years ago |
|
dxfeng
|
06179dbaa8
|
Merge pull request '编制、人员编号、岗位部门、自定义下拉框BUG修复' (#25) from feature/dxf into develop
Reviewed-on: #25
|
3 years ago |
|
dxfeng
|
7258ee742d
|
编制模板优化
|
3 years ago |
|
dxfeng
|
b2fc9d3e0c
|
人员编号、岗位部门、自定义下拉框BUG修复
|
3 years ago |
|
dxfeng
|
eeb21315c7
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
3 years ago |
|
dxfeng
|
a36648ea39
|
花名册树BUG
|
3 years ago |
|
‘ml’
|
f2c5d1227b
|
分部、部门、岗位禁用、合并修复1025
|
3 years ago |
|
‘ml’
|
e198209705
|
Merge remote-tracking branch 'origin/develop' into feature/ml
|
3 years ago |
|
dxfeng
|
b578c66495
|
Merge pull request '更新人员Map表信息' (#24) from feature/dxf into develop
Reviewed-on: #24
|
3 years ago |
|
dxfeng
|
594173175c
|
更新人员Map表信息
|
3 years ago |
|
dxfeng
|
3cf48e443a
|
Merge pull request '人员导入、花名册左侧树BUG修复' (#23) from feature/dxf into develop
Reviewed-on: #23
|
3 years ago |
|
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
|
7e1e1eae5c
|
Merge pull request 'SQL脚本、编制导入模板、人员卡片、组织架构图Oracle' (#22) from feature/dxf into develop
Reviewed-on: #22
|
3 years ago |
|
dxfeng
|
dca18ea5b1
|
编制导入模板、人员卡片、组织架构图Oracle
|
3 years ago |
|
dxfeng
|
d9bdda1fa6
|
SQL脚本调整
|
3 years ago |
|
dxfeng
|
771996f138
|
Merge pull request '人员相关BUG修复' (#21) from feature/dxf into develop
Reviewed-on: #21
|
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’
|
444153f44d
|
Merge remote-tracking branch 'origin/develop' into feature/ml
|
3 years ago |
|
‘ml’
|
887a1eafe3
|
Merge remote-tracking branch 'origin/develop' into feature/ml
|
3 years ago |
|
dxfeng
|
275b017db1
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
3 years ago |
|
‘ml’
|
9a9b79cff0
|
Merge remote-tracking branch 'origin/develop' into feature/ml
|
3 years ago |
|
‘ml’
|
a0660a7857
|
分部转移、部门转移、岗位合并修复1020
|
3 years ago |
