 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
|
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
|
06c9912d21
|
BUG修复,岗位关联关系调整
|
2 years ago |
|
dxfeng
|
3470ba04cd
|
岗位关联关系调整
|
2 years ago |
|
Mlin
|
73dbaf75ac
|
分部版本控制写入逻辑
|
2 years ago |
|
dxfeng
|
c1c812596d
|
BUG修复
|
2 years ago |
|
dxfeng
|
f89ebdb965
|
分部、部门联调。BUG修复
|
2 years ago |
 Chengliang
|
d345a5fe66
|
版本管理
|
2 years ago |
|
dxfeng
|
64af65cad3
|
部门导入新增、更新
|
2 years ago |
|
dxfeng
|
54c3676c07
|
分部BUG修复，导入接口逻辑重写
|
2 years ago |
|
dxfeng
|
85ec966813
|
人员卡片查看页面逻辑重写
|
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
|
ae2e5bb5a4
|
人员Mapper整合
|
2 years ago |
|
dxfeng
|
7d1fc84fad
|
组织架构树排序、人员卡片BUG修复
|
2 years ago |
|
dxfeng
|
a273008715
|
导入BUG，提示信息优化
|
2 years ago |
|
dxfeng
|
81943df058
|
编制、分部树排序
|
2 years ago |
|
dxfeng
|
9b20c6838a
|
人事卡片按钮权限BUG
|
2 years ago |
|
dxfeng
|
17f4789e33
|
BUG修复
|
2 years ago |
|
dxfeng
|
05364f9265
|
BUG修复
|
2 years ago |
|
dxfeng
|
10bb8159aa
|
明细表BUG修复
|
2 years ago |
|
dxfeng
|
7b5a4905dc
|
BUG修复、卡片按钮排序
|
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 |
‘ml’
|
091f202eac
|
职务导入
|
2 years ago |
|
dxfeng
|
854a40b7cd
|
人员卡片按钮自定义
|
2 years ago |
|
dxfeng
|
d16f13405c
|
人员卡片按钮自定义
|
2 years ago |
|
dxfeng
|
57d788d807
|
人员卡片按钮权限
|
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
|
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 |
|
Chengliang
|
99f849f350
|
bug修复
|
2 years ago |
|
dxfeng
|
a3a0ce8046
|
岗位按钮、人员字段权限
|
2 years ago |
|
Chengliang
|
dc347c755d
|
人员卡片菜单权限接口
|
2 years ago |
|
dxfeng
|
31645b34fe
|
分权BUG修复
|
3 years ago |
|
dxfeng
|
47aafefa5a
|
分权BUG修复
|
3 years ago |
|
dxfeng
|
18767b722c
|
聚才林岗位分权
|
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
|
895528617b
|
分部、部门、岗位、人员 分权功能开发
|
3 years ago |
|
dxfeng
|
0b3cd0641b
|
分权开发
|
3 years ago |
|
dxfeng
|
40f1f097e6
|
代码合并
|
3 years ago |
|
Chengliang
|
ef392f4d0a
|
模块管理分权
|
3 years ago |
|
‘ml’
|
939e6c7607
|
分部转移、部门转移、岗位合并修复1021
|
3 years ago |
|
Chengliang
|
96cefec891
|
模块管理分权
|
3 years ago |
|
Chengliang
|
f6ea4425cf
|
模块管理分权
|
3 years ago |
|
Chengliang
|
4c74b583bf
|
模块管理分权
|
3 years ago |
|
dxfeng
|
92b246b5d5
|
组织架构图相关BUG修复
|
3 years ago |
|
dxfeng
|
679c77f732
|
组织架构图相关BUG修复
|
3 years ago |
|
dxfeng
|
b2fc9d3e0c
|
人员编号、岗位部门、自定义下拉框BUG修复
|
3 years ago |
|
‘ml’
|
f2c5d1227b
|
分部、部门、岗位禁用、合并修复1025
|
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
|
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’
|
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
|
eb007f5b23
|
人事卡片BUG修复
|
3 years ago |
|
‘ml’
|
5005243758
|
部门合并在岗数优化
|
3 years ago |
|
dxfeng
|
63b6b88a96
|
人员管理BUG修复
|
3 years ago |
|
dxfeng
|
396a4570d0
|
BUG修复
|
3 years ago |
|
dxfeng
|
f36756e1fd
|
分部、岗位 禁用功能限制
|
3 years ago |
|
dxfeng
|
f9c33da655
|
人员管理完善
|
3 years ago |
|
dxfeng
|
46068ab008
|
编制Action 添加提示信息，BUG修复
|
3 years ago |
|
dxfeng
|
f26159506a
|
岗位浏览按钮、编制action BUG修复
|
3 years ago |
|
dxfeng
|
9df3349715
|
兼容EC岗位名称重复
|
3 years ago |
|
dxfeng
|
231addfda1
|
人事卡片接口开发
|
3 years ago |
|
dxfeng
|
284f778963
|
人员调整,在岗数关联优化
|
3 years ago |
|
dxfeng
|
acee0bad51
|
人员调整,在岗数关联优化
|
3 years ago |
|
dxfeng
|
c6fb0d129b
|
组织架构图编制、在岗,数据优化
|
3 years ago |
|
dxfeng
|
02836ce37d
|
岗位名称校验、编制展示优化、BUG修复
|
3 years ago |
|
dxfeng
|
92d9a17d8c
|
组织架构图编制显示优化
|
3 years ago |
|
dxfeng
|
106d7e8bb8
|
更新人员、编制 同步组织架构图
|
3 years ago |
|
dxfeng
|
a847a4efef
|
兼容Oracle,达梦
|
3 years ago |
|
dxfeng
|
8a9370ee9e
|
BUG修复
|
3 years ago |
|
dxfeng
|
2632f6c857
|
BUG修复
|
3 years ago |
|
dxfeng
|
fe668c37e7
|
BUG修复
|
3 years ago |
|
dxfeng
|
35439a442f
|
BUG 修复
|
3 years ago |
|
dxfeng
|
5c66744468
|
部门合并、组织导入
|
3 years ago |
|
dxfeng
|
f6c41a3467
|
部门合并重写
|
3 years ago |
|
dxfeng
|
34af4f95c9
|
Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf
|
3 years ago |
|
dxfeng
|
79c5f94862
|
导入问题处理
|
3 years ago |
|
dxfeng
|
120b4efdba
|
不同等级方案、编号可重复
|
3 years ago |
|
Chengliang
|
ba0b31f086
|
fixed
|
3 years ago |
|
dxfeng
|
6c04ffd384
|
编制管理
|
3 years ago |
|
dxfeng
|
6415ee3eb7
|
编制方案
|
3 years ago |
|
dxfeng
|
b1b2a9a88a
|
部门管理，更新为EC
|
3 years ago |
|
dxfeng
|
4fa38f704c
|
分部管理，更新为EC
|
3 years ago |
|
Chengliang
|
0ffb0bac33
|
fix
|
3 years ago |
|
Chengliang
|
819a053aa3
|
fixed
|
3 years ago |
|
dxfeng
|
b49a25742a
|
触发器、非标开关
|
3 years ago |
|
dxfeng
|
1f7f299368
|
分部、部门、岗位触发器
|
3 years ago |
|
dxfeng
|
56ed6aa197
|
BUG修复
|
3 years ago |
|
dxfeng
|
21dc07dd40
|
BUG修复
|
3 years ago |
|
dxfeng
|
b6caffc74f
|
人员信息分类 删除接口
|
3 years ago |
|
dxfeng
|
2744f85eff
|
BUG修复
|
3 years ago |
|
dxfeng
|
6351109b79
|
人员信息分类
|
3 years ago |
|
dxfeng
|
f82e679837
|
Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf
|
3 years ago |
|
dxfeng
|
8968e44e09
|
分部、部门、岗位同步EC重写
|
3 years ago |
|
Chengliang
|
6bfc6eae27
|
人员信息管理
|
3 years ago |
|
Chengliang
|
ca7d34a5bd
|
人员信息模块
|
3 years ago |
|
dxfeng
|
564b30eed8
|
BUG修复
|
3 years ago |
|
dxfeng
|
477a2f3bce
|
自定义字段BUG修复
|
3 years ago |
|
dxfeng
|
ff8660a586
|
BUG修复
|
3 years ago |
|
dxfeng
|
3acec4730d
|
BUG修复，权限控制
|
3 years ago |
|
dxfeng
|
e4d9d80fee
|
兼容Oracle
|
3 years ago |
|
dxfeng
|
1318fc1aba
|
BUG修复
|
3 years ago |
|
dxfeng
|
05c24b5e98
|
Oracle BUG修复
|
3 years ago |
|
dxfeng
|
f27612db94
|
Oracle BUG修复
|
3 years ago |
|
dxfeng
|
6576335c6c
|
BUG修复
|
3 years ago |
|
dxfeng
|
08a9ab7b0d
|
BUG修复
|
3 years ago |
|
dxfeng
|
1c9b1abe69
|
编制方案需求完善
|
3 years ago |
|
dxfeng
|
7b88ba5a78
|
编制方案需求完善
|
3 years ago |
|
dxfeng
|
46ab51ee18
|
人员导入、CusFieldData触发器调整
|
3 years ago |
|
dxfeng
|
ceba6b5d62
|
BUG修复
|
3 years ago |
|
dxfeng
|
0a47b3548d
|
人员导入
|
3 years ago |
|
dxfeng
|
d5447c8e59
|
岗位导入
|
3 years ago |
|
dxfeng
|
fc8aaf7729
|
部门导入、日志记录
|
3 years ago |
|
dxfeng
|
b1365da225
|
分部导入
|
3 years ago |
|
dxfeng
|
9d304b0303
|
分部导入
|
3 years ago |
|
dxfeng
|
56a697d4e4
|
BUG 修复
|
3 years ago |
|
dxfeng
|
b8adf9ab7b
|
岗位模块操作同步EC
|
3 years ago |
|
dxfeng
|
15c9ef7e61
|
分部、部门 添加UUID列;部门表结构更新
|
3 years ago |
|
dxfeng
|
e217ecbe16
|
分部更新EC
|
3 years ago |
|
dxfeng
|
b52bb93dfa
|
人员拓展卡片、分部更新EC
|
3 years ago |
|
dxfeng
|
81fcd96af6
|
人员拓展卡片
|
3 years ago |
|
dxfeng
|
7103eb0c73
|
记录操作日志
|
3 years ago |
|
dxfeng
|
40a7c066a2
|
记录操作日志
|
3 years ago |
|
dxfeng
|
f5d95fabb2
|
记录操作日志
|
3 years ago |
|
dxfeng
|
033e90aa34
|
操作日志
|
3 years ago |
