Mlin
|
a677da06a6
|
花名册模板管理查询、编辑保存20230112
|
2 years ago |
 dxfeng
|
cb814ef077
|
显示定制列穿梭框接口开发
|
2 years ago |
|
dxfeng
|
b93a3d7b1c
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2 years ago |
|
dxfeng
|
a7b1f33e1a
|
显示定制列穿梭框接口开发
|
2 years ago |
|
Mlin
|
044f963f31
|
Merge remote-tracking branch 'origin/develop' into feature/ml
# Conflicts:
# src/com/engine/organization/service/HrmResourceService.java
# src/com/engine/organization/service/impl/HrmResourceServiceImpl.java
# src/com/engine/organization/web/HrmResourceController.java
# src/com/engine/organization/wrapper/HrmResourceWrapper.java
|
2 years ago |
|
Mlin
|
8750850dfa
|
花名册列定制模板查询20230112
|
2 years ago |
|
Mlin
|
09d4dbddd5
|
花名册列定制模板查询20230112
|
2 years ago |
|
dxfeng
|
0f73f6e3ac
|
显示定制列穿梭框接口开发
|
2 years ago |
|
dxfeng
|
d5ca665f2f
|
显示定制列穿梭框接口开发
|
2 years ago |
|
Mlin
|
f86562c802
|
Merge remote-tracking branch 'origin/develop' into feature/ml
|
2 years ago |
|
Mlin
|
71c427d1ec
|
花名册自定义字段展示20230111
|
2 years ago |
|
dxfeng
|
4076a755f1
|
花名册高级搜索BUG修复
|
2 years ago |
|
Mlin
|
12bcd367c7
|
Merge remote-tracking branch 'origin/develop' into feature/ml
|
2 years ago |
|
dxfeng
|
6e1f70ef82
|
花名册高级搜索BUG修复
|
2 years ago |
|
dxfeng
|
1d053a0437
|
花名册高级搜索BUG修复
|
2 years ago |
|
dxfeng
|
832fb2b9c4
|
花名册高级搜索BUG修复
|
2 years ago |
|
dxfeng
|
f7ce6b028a
|
花名册高级搜索BUG修复
|
2 years ago |
|
dxfeng
|
9dbce1e8c5
|
花名册高级搜索BUG修复
|
2 years ago |
|
dxfeng
|
4ba6d5c21e
|
花名册高级搜索BUG修复
|
2 years ago |
|
dxfeng
|
9e6cc7da2a
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2 years ago |
|
dxfeng
|
cfe08ddf4c
|
花名册动态查询SQL
|
2 years ago |
 Chengliang
|
07786bc2a6
|
花名册增加按钮
|
2 years ago |
|
dxfeng
|
01c042ebbc
|
高级搜索表单完善
|
2 years ago |
|
dxfeng
|
503697dd55
|
花名册高级搜索相关接口
|
2 years ago |
|
Mlin
|
1c3b1296b5
|
Merge remote-tracking branch 'origin/develop' into feature/ml
|
2 years ago |
|
Mlin
|
d1612a151a
|
花名册自定义字段展示20230106
|
2 years ago |
|
dxfeng
|
3e0d3a1b2e
|
花名册高级搜索相关接口
|
2 years ago |
|
dxfeng
|
4d43e0605b
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2 years ago |
|
dxfeng
|
92c51cfe18
|
花名册高级搜索相关接口
|
2 years ago |
|
Mlin
|
00ab437f9e
|
增加全部人员简历下载条件（去除离职）（20230106）
|
2 years ago |
|
Mlin
|
c7ce7ea540
|
优化人员简历目录删除问题（20230105）
|
2 years ago |
|
Mlin
|
0ef350c902
|
人员简历合并导出日志（20230105）
|
2 years ago |
|
Mlin
|
95a6b388c4
|
修复人员简历合并图片重复问题（20230105）
|
2 years ago |
|
Mlin
|
b515fdb78f
|
人员简历导出、压缩下载（20230105）
|
2 years ago |
|
Mlin
|
d81776680f
|
Merge remote-tracking branch 'origin/develop' into feature/ml
|
2 years ago |
|
dxfeng
|
b2500cfbd0
|
人员筛选接口开发、调整
|
2 years ago |
|
Mlin
|
ab881b8d8f
|
Merge remote-tracking branch 'origin/develop' into feature/ml
# Conflicts:
# src/com/engine/organization/service/PersonnelResumeService.java
# src/com/engine/organization/service/impl/PersonnelResumeServiceImpl.java
# src/com/engine/organization/web/PersonnelResumeController.java
# src/com/engine/organization/wrapper/PersonnelResumeWrapper.java
|
2 years ago |
|
Mlin
|
5450b99e37
|
人员简历导出下载（20230105）
|
2 years ago |
|
dxfeng
|
586330f99e
|
人员筛选接口开发、调整
|
2 years ago |
|
Mlin
|
06da61d889
|
Merge remote-tracking branch 'origin/develop' into feature/ml
|
2 years ago |
|
Mlin
|
6d1603aeb2
|
人员简历模板导出20230103
|
2 years ago |
|
dxfeng
|
bccae91e75
|
人员简历模板优化
|
2 years ago |
|
dxfeng
|
395d93067a
|
Oracle,SQL脚本BUG修复
|
2 years ago |
|
Mlin
|
90e6d7b765
|
Merge remote-tracking branch 'origin/develop' into feature/ml
# Conflicts:
# src/com/engine/organization/service/impl/PersonnelResumeServiceImpl.java
# src/com/engine/organization/web/PersonnelResumeController.java
# src/com/engine/organization/wrapper/PersonnelResumeWrapper.java
|
2 years ago |
|
Mlin
|
a86a8dd2c8
|
人员简历模板导出
|
2 years ago |
|
Mlin
|
bc47f697d0
|
人员简历模板导出
|
2 years ago |
|
dxfeng
|
dde1d0d0db
|
人员简历相关接口开发
|
2 years ago |
|
dxfeng
|
687b580494
|
人员简历相关接口开发
|
2 years ago |
|
dxfeng
|
df57b4e71f
|
人员简历相关接口开发
|
2 years ago |
|
dxfeng
|
c41716318d
|
人员简历相关接口开发
|
2 years ago |
|
dxfeng
|
702092c5a2
|
人员简历相关接口开发
|
2 years ago |
|
dxfeng
|
ea22378df0
|
人员简历相关接口开发
|
2 years ago |
|
dxfeng
|
33e9073e1c
|
人员简历相关接口开发
|
2 years ago |
|
dxfeng
|
b53007b7c2
|
人员简历相关接口开发
|
2 years ago |
|
dxfeng
|
2e39235515
|
人员简历相关接口开发
|
2 years ago |
|
Mlin
|
950da74ac8
|
人员岗位显示bug修复
|
2 years ago |
|
Mlin
|
347e3505d1
|
多个部门负责人存入版本bug修复
|
2 years ago |
|
Mlin
|
7b9a82dda9
|
多部门负责人截取显示bug修复
|
2 years ago |
|
Mlin
|
4a0949b6b1
|
多部门负责人截取显示bug修复
|
2 years ago |
|
Mlin
|
18b50a4431
|
Merge remote-tracking branch 'origin/develop' into feature/ml
|
2 years ago |
|
Mlin
|
d231bf3bd3
|
多部门负责人截取显示
|
2 years ago |
|
dxfeng
|
8c6becc29c
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2 years ago |
|
Mlin
|
fbac015a99
|
部门转移岗位重复bug修复
|
2 years ago |
|
dxfeng
|
23eae34062
|
人员导出BUG
|
2 years ago |
|
dxfeng
|
a6ed99fc60
|
部门导入BUG修复
|
2 years ago |
|
Mlin
|
33106aaaec
|
sqlserver版本存入、部门转移
|
2 years ago |
|
dxfeng
|
b7938cfb6b
|
多部门负责人BUG修复
|
2 years ago |
|
dxfeng
|
4ca7eeb93c
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2 years ago |
|
dxfeng
|
665172325e
|
职等职级BUG修复
|
2 years ago |
|
Mlin
|
6dcb5db15f
|
动态字段查询
|
2 years ago |
|
dxfeng
|
a080ebea22
|
岗位浏览按钮BUG修复
|
2 years ago |
|
dxfeng
|
30bec2120a
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2 years ago |
|
dxfeng
|
31a26dec08
|
部门合并、转移。岗位同步BUG修复
|
2 years ago |
|
Mlin
|
b8158cdcec
|
oracle版数据同步问题
|
2 years ago |
|
dxfeng
|
ebf7a1bdda
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2 years ago |
|
dxfeng
|
e7cc13ed60
|
BUG修复
|
2 years ago |
|
Mlin
|
30898d0eee
|
oracle环境存入版本bug修复、新增职等职级1220
|
2 years ago |
|
Mlin
|
0128de79ea
|
oracle环境存入版本bug修复、新增职等职级1219
|
2 years ago |
|
dxfeng
|
2b0c1d0a69
|
BUG修复
|
2 years ago |
|
dxfeng
|
d21d3148bf
|
Oracle版本BUG修复
|
2 years ago |
|
Mlin
|
5bcd3e22fc
|
oracle环境存入版本bug修复1219
|
2 years ago |
|
Mlin
|
806d18e511
|
Merge remote-tracking branch 'origin/develop' into feature/ml
|
2 years ago |
|
Mlin
|
a5cc902c10
|
oracle环境存入版本bug修复
|
2 years ago |
|
dxfeng
|
b11251701a
|
BUG修复
|
2 years ago |
|
Mlin
|
afe4813427
|
Merge remote-tracking branch 'origin/develop' into feature/ml
|
2 years ago |
|
Mlin
|
78d08ea740
|
无历史版本返回为空
|
2 years ago |
|
dxfeng
|
c86e37495d
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2 years ago |
|
dxfeng
|
b9cfe839e7
|
BUG修复
|
2 years ago |
|
Mlin
|
78dfc87f61
|
同步数据接口
|
2 years ago |
|
Mlin
|
0b89abeaac
|
Merge remote-tracking branch 'origin/develop' into feature/ml
|
2 years ago |
|
Mlin
|
981ea3ad4a
|
存为版本取消存入map表，同步接口
|
2 years ago |
|
dxfeng
|
434dbacb64
|
根据职等职级字段，补充人员信息
|
2 years ago |
|
dxfeng
|
ebe5003df9
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2 years ago |
|
dxfeng
|
f428dff5a0
|
根据职等职级字段，补充人员信息
|
2 years ago |
|
Mlin
|
b59f3a9d9f
|
定时任务刷新在岗数bug修复
|
2 years ago |
|
Mlin
|
8cda66dc8b
|
bug修复
|
2 years ago |
|
Mlin
|
241bf47710
|
Merge remote-tracking branch 'origin/develop' into feature/ml
|
2 years ago |
|
Mlin
|
184a9e375f
|
版本查询接口二版
|
2 years ago |
|
liang.cheng
|
afa66c74c1
|
Merge pull request '岗位刷新功能' (#100) from feature/cl into develop
Reviewed-on: #100
|
2 years ago |
|
Mlin
|
95d53a6d8c
|
Merge remote-tracking branch 'origin/develop' into feature/ml
|
2 years ago |
|
Mlin
|
faaed265fe
|
版本查询接口初版
|
2 years ago |
|
Chengliang
|
4105600770
|
岗位刷新功能
|
2 years ago |
|
Chengliang
|
4d8948724e
|
岗位增加刷新按钮
|
2 years ago |
|
dxfeng
|
e26e780310
|
Merge pull request 'BUG修复' (#98) from feature/dxf into develop
Reviewed-on: #98
|
2 years ago |
|
dxfeng
|
1db4a85d46
|
BUG修复
|
2 years ago |
|
Mlin
|
569a3132c1
|
分部、部门、人员封存后取消架构图展示
|
2 years ago |
|
Mlin
|
3be6bf11a2
|
Merge remote-tracking branch 'origin/develop' into feature/ml
|
2 years ago |
|
Mlin
|
b3057e2f4e
|
版本查询接口
|
2 years ago |
|
Mlin
|
3462511603
|
showOrder类型小数转换
|
2 years ago |
|
dxfeng
|
550be7fb14
|
BUG修复
|
2 years ago |
|
Mlin
|
7f51135424
|
定时任务
|
2 years ago |
|
Mlin
|
94690cbd86
|
定时任务
|
2 years ago |
|
dxfeng
|
42545745fe
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2 years ago |
|
dxfeng
|
946354b32d
|
BUG修复
|
2 years ago |
|
Mlin
|
1db1949a94
|
Merge remote-tracking branch 'origin/develop' into feature/ml
|
2 years ago |
|
Mlin
|
43f00f7d9d
|
sqlserver存入版本修复、定时任务
|
2 years ago |
|
dxfeng
|
d2f6fa693a
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2 years ago |
|
dxfeng
|
4117a34928
|
BUG修复
|
2 years ago |
|
dxfeng
|
8383c08a06
|
BUG修复
|
2 years ago |
|
Mlin
|
9c80a74386
|
oracle、sqlserver查询版本语句(部门存入失败)
|
2 years ago |
|
dxfeng
|
b9d06b4246
|
分权功能版本回退，岗位BUG修复
|
2 years ago |
|
Mlin
|
5897ae1563
|
Merge remote-tracking branch 'origin/develop' into feature/ml
|
2 years ago |
|
Mlin
|
e81d8f4939
|
oracle、sqlserver查询版本语句
|
2 years ago |
|
dxfeng
|
fab4614cd5
|
分权功能重构，调用EC方法
|
2 years ago |
|
dxfeng
|
ce2c34cfdd
|
BUG修复,岗位关联关系调整
|
2 years ago |
|
dxfeng
|
32fd42db2f
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2 years ago |
|
dxfeng
|
b64f15bd83
|
BUG修复,岗位关联关系调整
|
2 years ago |
|
Mlin
|
2b549bcc4a
|
人员版本控制写入逻辑
|
2 years ago |
|
dxfeng
|
6169b007ae
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2 years ago |
|
Mlin
|
32e8eb4890
|
分部、部门版本控制写入逻辑
|
2 years ago |
|
Mlin
|
1bdc7e2fa4
|
Merge remote-tracking branch 'origin/develop' into feature/ml
|
2 years ago |
|
Mlin
|
13ae136872
|
部门版本控制写入逻辑
|
2 years ago |
|
dxfeng
|
45a24cb0be
|
BUG修复,岗位关联关系调整
|
2 years ago |
|
dxfeng
|
06c9912d21
|
BUG修复,岗位关联关系调整
|
2 years ago |
|
dxfeng
|
dee6bb25b5
|
岗位关联关系调整
|
2 years ago |
|
dxfeng
|
3470ba04cd
|
岗位关联关系调整
|
2 years ago |
|
Mlin
|
73dbaf75ac
|
分部版本控制写入逻辑
|
2 years ago |
|
dxfeng
|
b368c3ea27
|
BUG修复
|
2 years ago |
|
dxfeng
|
c1c812596d
|
BUG修复
|
2 years ago |
|
dxfeng
|
eaa1c53c9c
|
分部、部门联调。BUG修复
|
2 years ago |
|
dxfeng
|
f89ebdb965
|
分部、部门联调。BUG修复
|
2 years ago |
|
dxfeng
|
a1f2c9d1ac
|
BUG修复
|
2 years ago |
|
dxfeng
|
ea8a48099f
|
Merge pull request '人员导入逻辑重写' (#87) from feature/dxf into develop
Reviewed-on: #87
|
2 years ago |
|
dxfeng
|
668231fd61
|
人员导入逻辑重写
|
2 years ago |
|
Chengliang
|
d345a5fe66
|
版本管理
|
2 years ago |
|
dxfeng
|
de03ca3b8b
|
部门列表BUG修复
|
2 years ago |
|
dxfeng
|
3477539393
|
部门列表BUG修复
|
2 years ago |
|
dxfeng
|
37dc31b7b5
|
部门查看、编辑接口调整
|
2 years ago |
|
dxfeng
|
6fc67d7d67
|
分部查看、编辑接口调整
|
2 years ago |
|
dxfeng
|
64af65cad3
|
部门导入新增、更新
|
2 years ago |
|
dxfeng
|
324881794b
|
分部导入新增、更新
|
2 years ago |
|
dxfeng
|
54c3676c07
|
分部BUG修复，导入接口逻辑重写
|
2 years ago |
|
dxfeng
|
85ec966813
|
人员卡片查看页面逻辑重写
|
2 years ago |
|
dxfeng
|
fb17f43323
|
部门管理功能逻辑调整
|
2 years ago |
|
dxfeng
|
bd33075e14
|
部门管理功能逻辑调整
|
2 years ago |
|
dxfeng
|
40a6540a1d
|
部门管理功能逻辑调整
|
2 years ago |
|
dxfeng
|
238d8e6f75
|
部门接口逻辑调整
|
2 years ago |
|
dxfeng
|
9a2eabc8bd
|
部门切换数据源、实体类更新
|
2 years ago |
|
dxfeng
|
aa3d0742ff
|
分部接口整理、代码优化
|
2 years ago |
|
dxfeng
|
416471a283
|
分部列表、新增、删除、转移功能重写
|
2 years ago |
|
dxfeng
|
f7758e5298
|
人员导入提示信息优化
|
2 years ago |
|
dxfeng
|
5d2b880ed5
|
人员同步BUG修复，导入优化
|
2 years ago |
|
dxfeng
|
ae2e5bb5a4
|
人员Mapper整合
|
2 years ago |
|
dxfeng
|
7d1fc84fad
|
组织架构树排序、人员卡片BUG修复
|
2 years ago |
|
dxfeng
|
e45ff3daa3
|
导入BUG，提示信息优化
|
2 years ago |
|
dxfeng
|
25d3db4d81
|
导入BUG，提示信息优化
|
2 years ago |
|
dxfeng
|
a273008715
|
导入BUG，提示信息优化
|
2 years ago |
|
dxfeng
|
0404c4b7fd
|
导入自动编号
|
2 years ago |
|
dxfeng
|
47c09cac9a
|
导入自动编号
|
2 years ago |
|
dxfeng
|
81943df058
|
编制、分部树排序
|
2 years ago |
|
dxfeng
|
9b20c6838a
|
人事卡片按钮权限BUG
|
2 years ago |
|
dxfeng
|
49b4358e17
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2 years ago |
|
dxfeng
|
f9f5bc432c
|
BUG修复
|
2 years ago |
‘ml’
|
b5d5b717d1
|
职务导入提示优化修复20221116
|
2 years ago |
|
dxfeng
|
17f4789e33
|
BUG修复
|
2 years ago |
|
dxfeng
|
67fd2df4f9
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2 years ago |
|
liang.cheng
|
b3bfad0148
|
Merge pull request '“栏目表格修复”' (#65) from feature/cl into develop
Reviewed-on: #65
|
2 years ago |
|
Chengliang
|
cb4db723e4
|
“栏目表格修复”
|
2 years ago |
|
dxfeng
|
05364f9265
|
BUG修复
|
2 years ago |
|
‘ml’
|
caa9604315
|
职级导入异常处理方案1116
|
2 years ago |
|
dxfeng
|
bb071c3ad9
|
Merge pull request '花名册树、角色展示、组织透视下拉框' (#64) from feature/dxf into develop
Reviewed-on: #64
|
2 years ago |
|
dxfeng
|
2d64a5015b
|
组织透视下拉框BUG
|
2 years ago |
|
‘ml’
|
706edd43ed
|
职级导入提示优化1115
|
2 years ago |
|
dxfeng
|
4fc2eca27b
|
花名册树、角色展示BUG
|
2 years ago |
|
dxfeng
|
f1a3565fc7
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2 years ago |
|
dxfeng
|
10bb8159aa
|
明细表BUG修复
|
2 years ago |
|
‘ml’
|
0bcdbc9de8
|
Merge remote-tracking branch 'origin/develop' into feature/ml
|
2 years ago |
|
‘ml’
|
306897c5bc
|
职务导入模板提示修复1114
|
2 years ago |
|
dxfeng
|
7c79718d6e
|
人员卡片，修改字段名
|
2 years ago |
|
dxfeng
|
3ec8afe78b
|
人员卡片，明细表展示
|
2 years ago |
|
dxfeng
|
7b5a4905dc
|
BUG修复、卡片按钮排序
|
2 years ago |
|
‘ml’
|
af6d920b59
|
职务导入模板生成
|
2 years ago |
|
dxfeng
|
4a0ddd8adc
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2 years ago |
|
dxfeng
|
cd11f06b7f
|
卡片按钮新增、删除
|
2 years ago |
|
liang.cheng
|
c9b82b5f71
|
Merge pull request 'bug修复' (#56) from feature/cl into develop
Reviewed-on: #56
|
2 years ago |
|
Chengliang
|
d236127f31
|
bug修复
|
2 years ago |
|
‘ml’
|
091f202eac
|
职务导入
|
2 years ago |
|
dxfeng
|
16794bf98c
|
人员卡片按钮保存
|
2 years ago |
|
dxfeng
|
854a40b7cd
|
人员卡片按钮自定义
|
2 years ago |
|
dxfeng
|
b7217dae23
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2 years ago |
|
dxfeng
|
d16f13405c
|
人员卡片按钮自定义
|
2 years ago |
|
‘ml’
|
1baf55e04f
|
职级职等导入更新
|
2 years ago |
|
‘ml’
|
9517ad15d6
|
优化职级模板字段顺序
|
2 years ago |
|
‘ml’
|
ba2434b130
|
Merge remote-tracking branch 'origin/develop' into feature/ml
|
2 years ago |
|
‘ml’
|
0459c628ea
|
职等职级导入接口20221111
|
2 years ago |
|
dxfeng
|
57d788d807
|
人员卡片按钮权限
|
2 years ago |
|
Chengliang
|
8e93568aa4
|
bug修复
|
2 years ago |
|
‘ml’
|
0da123fcef
|
Merge branch 'feature/ml' into develop
# Conflicts:
# src/com/engine/organization/service/impl/ImportCommonServiceImpl.java
|
2 years ago |
|
‘ml’
|
ec8be58a45
|
职等职级导入接口
|
2 years ago |
|
Chengliang
|
eeefde07ed
|
接口
|
2 years ago |
|
dxfeng
|
fa1434a64a
|
卡片分组权限
|
2 years ago |
|
dxfeng
|
dcf8418edb
|
代码还原
|
2 years ago |
|
dxfeng
|
0e41f08327
|
组织架构图搜索下拉框、集团负责人BUG修复
|
2 years ago |
|
‘ml’
|
ddafc854b6
|
修复组织机构图虚拟组织不显示
|
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 |
|
Chengliang
|
2b975e6636
|
模块管理分权中心接口
|
3 years ago |
|
dxfeng
|
92b246b5d5
|
组织架构图相关BUG修复
|
3 years ago |
|
dxfeng
|
679c77f732
|
组织架构图相关BUG修复
|
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
|
594173175c
|
更新人员Map表信息
|
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
|
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 |
