 liang.cheng
|
2d600e4cd2
|
Merge pull request '测试' (#201) from feature/cl into develop
Reviewed-on: #201
|
2 years ago |
|
Chengliang
|
01dc480720
|
测试
|
2 years ago |
 dxfeng
|
0898759845
|
人员快捷搜索BUG修复
|
2 years ago |
|
dxfeng
|
6bc5db7912
|
人员快捷搜索
|
2 years ago |
|
dxfeng
|
3ff6712b27
|
快捷搜索条件表单
|
2 years ago |
|
dxfeng
|
16cb2c844d
|
快捷搜索条件表单
|
2 years ago |
|
dxfeng
|
5a71b861fd
|
快捷搜索条件表单
|
2 years ago |
|
dxfeng
|
cef2ef82b1
|
Merge remote-tracking branch 'origin/develop' into develop
|
2 years ago |
|
dxfeng
|
a56b888a74
|
快捷搜索条件表单
|
2 years ago |
|
dxfeng
|
4438f3937a
|
快捷搜索条件表单
|
2 years ago |
|
dxfeng
|
e6600a813c
|
Merge pull request '组织架构图排序' (#200) from feature/dxf into develop
Reviewed-on: #200
|
2 years ago |
|
dxfeng
|
17b9c57649
|
组织架构图排序
|
2 years ago |
|
dxfeng
|
939c6c3f51
|
快捷搜索自定义接口BUG修复
|
2 years ago |
|
dxfeng
|
dc0c823caf
|
快捷搜索自定义接口BUG修复
|
2 years ago |
|
dxfeng
|
55a22e8038
|
快捷搜索自定义接口BUG修复
|
2 years ago |
|
dxfeng
|
53e96cafe5
|
recordSet调整成MyBatis
|
2 years ago |
|
dxfeng
|
dacd9b180e
|
快捷搜索基本代码提交
|
2 years ago |
|
dxfeng
|
8a3885db76
|
人员动态列导出
|
2 years ago |
|
dxfeng
|
853bf4b006
|
组织架构树、部门台账优化；岗位同步逻辑重写
|
2 years ago |
|
dxfeng
|
49e9e33624
|
岗位台账展示信息优化
|
2 years ago |
|
dxfeng
|
a065c7369d
|
岗位台账展示信息优化
|
2 years ago |
Mlin
|
af4a2c87ef
|
拖拽逻辑代码优化
|
2 years ago |
|
Mlin
|
3619fe5ac3
|
Merge remote-tracking branch 'origin/develop' into feature/ml
|
2 years ago |
|
Mlin
|
6247129bcf
|
拖拽优化
|
2 years ago |
|
dxfeng
|
82d6cc74db
|
组织调整树BUG修复
|
2 years ago |
|
Mlin
|
8b894bbaa3
|
Merge remote-tracking branch 'origin/develop' into feature/ml
|
2 years ago |
|
Mlin
|
3bb8c35fb5
|
部门拖拽优化0802
|
2 years ago |
|
dxfeng
|
d068aa6bc1
|
组织管理，树结构展开功能完善、分部删除BUG修复
|
2 years ago |
|
Mlin
|
1ac72f3519
|
部门拖拽优化0802
|
2 years ago |
|
Mlin
|
33dda680df
|
部门拖拽优化
|
2 years ago |
|
Mlin
|
123f7eaea6
|
部门拖拽优化
|
2 years ago |
|
Mlin
|
72d2867244
|
Merge remote-tracking branch 'origin/develop' into feature/ml
|
2 years ago |
|
Mlin
|
2fdd604872
|
部门拖拽:分部优化
|
2 years ago |
|
dxfeng
|
647f692920
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2 years ago |
|
dxfeng
|
04826fcaa4
|
组织管理，树结构展开功能完善
|
2 years ago |
|
Mlin
|
63491e9906
|
部门拖拽转移优化
|
2 years ago |
|
Mlin
|
315a67173d
|
Merge remote-tracking branch 'origin/develop' into feature/ml
|
2 years ago |
|
Mlin
|
32029788c4
|
部门拖拽转移
|
2 years ago |
|
dxfeng
|
9a6f0a845e
|
组织管理，架构图树排序、BUG修复
|
2 years ago |
|
dxfeng
|
ea4a3201aa
|
组织管理，架构图部门树选择数据接口
|
2 years ago |
|
dxfeng
|
e011880672
|
组织管理，树结构禁用非部门节点
|
2 years ago |
|
Mlin
|
50ee698cc2
|
Merge remote-tracking branch 'origin/develop' into feature/ml
|
2 years ago |
|
Mlin
|
1a307f9923
|
部门合并，名称占用释放
|
2 years ago |
|
dxfeng
|
59d4fac4e2
|
组织管理，部门封存传参，树结构优化
|
2 years ago |
|
dxfeng
|
29bfcdc418
|
组织管理，分部封存传参
|
2 years ago |
|
dxfeng
|
3fa679b139
|
组织管理，树结构兼容是否封存
|
2 years ago |
|
dxfeng
|
4414b347f0
|
Merge pull request '组织管理，TreeSelect组件全量接口开发' (#199) from feature/dxf into develop
Reviewed-on: #199
|
2 years ago |
|
dxfeng
|
1280b3c6b9
|
组织管理，TreeSelect组件全量接口开发
|
2 years ago |
|
dxfeng
|
b74d06bf07
|
Merge pull request '组织管理，移动树接口提交' (#198) from feature/dxf into develop
Reviewed-on: #198
|
2 years ago |
|
dxfeng
|
b1b24fc925
|
组织管理，移动树接口提交
|
2 years ago |
|
dxfeng
|
7ab3436182
|
Merge pull request 'feature/dxf' (#197) from feature/dxf into develop
Reviewed-on: #197
|
2 years ago |
|
dxfeng
|
9610361733
|
组织管理，移动树接口提交
|
2 years ago |
|
dxfeng
|
87372be17f
|
组织管理，编制导入BUG修复
|
2 years ago |
|
dxfeng
|
820b13b932
|
Merge pull request 'feature/dxf' (#196) from feature/dxf into develop
Reviewed-on: #196
|
2 years ago |
|
dxfeng
|
46ecec4b17
|
组织管理，岗位台账、岗位浏览按钮列表展示优化
|
2 years ago |
|
dxfeng
|
fab01583ad
|
组织架构图，部门选择树
|
2 years ago |
|
dxfeng
|
f4c29de76b
|
新建编制信息初始化在编数
|
2 years ago |
|
Mlin
|
2ee38ccc0c
|
版本管理代码优化
|
2 years ago |
|
liang.cheng
|
691b4764b4
|
Merge pull request '排序 时间轴' (#195) from feature/cl into develop
Reviewed-on: #195
|
2 years ago |
|
Chengliang
|
d9e2a695cf
|
排序 时间轴
|
2 years ago |
|
Mlin
|
775405741a
|
版本管理，事务控制bug优化
|
2 years ago |
|
Mlin
|
0a809a29c9
|
版本管理，事务控制bug优化
|
2 years ago |
|
Mlin
|
1abbc7cddf
|
版本记录，未新增分部类型、部门类型字段时同步bug修复
|
2 years ago |
|
Mlin
|
7417cbac79
|
虚拟维度表查询bug修复
|
2 years ago |
|
Mlin
|
8ac0f45d29
|
版本记录，虚拟人员bug修复
|
2 years ago |
|
Mlin
|
3d7b5927b3
|
版本记录，虚拟人员bug修复
|
2 years ago |
|
Mlin
|
45b663217f
|
版本记录，分部bug修复
|
2 years ago |
|
Mlin
|
7d1b7b8795
|
版本记录，虚拟人员bug修复
|
2 years ago |
|
dxfeng
|
024d2a1591
|
Merge pull request 'feature/dxf' (#194) from feature/dxf into develop
Reviewed-on: #194
|
2 years ago |
|
dxfeng
|
696f66ec98
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2 years ago |
|
dxfeng
|
d510f32bc5
|
组织架构图，BUG修复
|
2 years ago |
|
liang.cheng
|
772287869e
|
Merge pull request 'v3' (#193) from feature/cl into develop
Reviewed-on: #193
|
2 years ago |
|
Chengliang
|
f5275c2148
|
v3
|
2 years ago |
|
Mlin
|
725d64888c
|
组织管理版本记录int类型bug修复
|
2 years ago |
|
Mlin
|
971b997dff
|
Merge remote-tracking branch 'origin/develop' into feature/ml
# Conflicts:
# src/com/engine/organization/service/impl/ChartServiceImpl.java
|
2 years ago |
|
Mlin
|
10a9a350b4
|
组织管理版本记录数据同步
|
2 years ago |
|
dxfeng
|
10983ab38a
|
Merge pull request 'feature/dxf' (#192) from feature/dxf into develop
Reviewed-on: #192
|
2 years ago |
|
dxfeng
|
a58e42d83c
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2 years ago |
|
dxfeng
|
62b25d6a65
|
组织架构图，回溯详细信息
|
2 years ago |
|
dxfeng
|
7e0553c0d2
|
Merge pull request 'feature/dxf' (#191) from feature/dxf into develop
Reviewed-on: #191
|
2 years ago |
|
dxfeng
|
c61a071746
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2 years ago |
|
dxfeng
|
3bf299afa4
|
组织架构图，回溯详细信息
|
2 years ago |
|
liang.cheng
|
8906b0753c
|
Merge pull request '列表' (#190) from feature/cl into develop
Reviewed-on: #190
|
2 years ago |
|
Chengliang
|
81f7ecfec9
|
列表
|
2 years ago |
|
dxfeng
|
194ee20b77
|
Merge pull request '组织架构图，回溯详细信息' (#189) from feature/dxf into develop
Reviewed-on: #189
|
2 years ago |
|
dxfeng
|
151e77e69b
|
组织架构图，回溯详细信息
|
2 years ago |
|
dxfeng
|
bfa3d147fc
|
Merge pull request 'feature/dxf' (#188) from feature/dxf into develop
Reviewed-on: #188
|
2 years ago |
|
dxfeng
|
104d94ba6f
|
组织架构图，回溯数据查询
|
2 years ago |
|
dxfeng
|
775cf4a8ae
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2 years ago |
|
Mlin
|
6befb0de03
|
Merge remote-tracking branch 'origin/develop' into feature/ml
# Conflicts:
# src/com/engine/organization/service/ChartService.java
# src/com/engine/organization/service/impl/ChartServiceImpl.java
|
2 years ago |
|
Mlin
|
38f3e457ef
|
组织管理版本记录0711
|
2 years ago |
|
liang.cheng
|
60de384cf6
|
Merge pull request 'v3' (#187) from feature/cl into develop
Reviewed-on: #187
|
2 years ago |
|
Chengliang
|
1a188a1975
|
v3
|
2 years ago |
|
dxfeng
|
d4a6fb4a28
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2 years ago |
|
dxfeng
|
075456caa9
|
组织架构图，<根结点>添加回溯联动
|
2 years ago |
|
liang.cheng
|
4e5eacfb38
|
Merge pull request 'v3' (#186) from feature/cl into develop
Reviewed-on: #186
|
2 years ago |
|
Chengliang
|
54abf562a4
|
v3
|
2 years ago |
|
liang.cheng
|
914649a35b
|
Merge pull request 'v3' (#185) from feature/cl into develop
Reviewed-on: #185
|
2 years ago |
|
Chengliang
|
688eeb125c
|
v3
|
2 years ago |
|
dxfeng
|
44e684a2a4
|
Merge pull request '组织架构图，兼容PG数据库' (#184) from feature/dxf into develop
Reviewed-on: #184
|
2 years ago |
|
dxfeng
|
c023822ca5
|
组织架构图，兼容PG数据库
|
2 years ago |
|
dxfeng
|
1dc5f3ce4b
|
Merge pull request '组织架构图，添加部门层级条件' (#183) from feature/dxf into develop
Reviewed-on: #183
|
2 years ago |
|
dxfeng
|
a18e7a3dc7
|
组织架构图，添加部门层级条件
|
2 years ago |
|
dxfeng
|
bba7288c5d
|
Merge pull request '组织架构图，岗位调整为查询聚才林岗位' (#182) from feature/dxf into develop
Reviewed-on: #182
|
2 years ago |
|
dxfeng
|
eb28328219
|
组织架构图，岗位调整为查询聚才林岗位
|
2 years ago |
|
dxfeng
|
45c623accd
|
Merge pull request '修复并发情况下，岗位数据重复问题' (#181) from feature/dxf into develop
Reviewed-on: #181
|
2 years ago |
|
dxfeng
|
d9ea8fe266
|
修复并发情况下，岗位数据重复问题
|
2 years ago |
|
dxfeng
|
b3f093a647
|
Merge pull request '组织架构图，人员列表添加key' (#180) from feature/dxf into develop
Reviewed-on: #180
|
2 years ago |
|
dxfeng
|
d2e1cacfa1
|
组织架构图，人员列表添加key
|
2 years ago |
|
dxfeng
|
c7bfa8126a
|
Merge pull request '组织架构图，人员列表显示转换调整' (#179) from feature/dxf into develop
Reviewed-on: #179
|
2 years ago |
|
dxfeng
|
7809f9ad3c
|
组织架构图，人员头像
|
2 years ago |
|
dxfeng
|
14135f0e47
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2 years ago |
|
dxfeng
|
436decbc85
|
组织架构图，人员列表显示转换调整
|
2 years ago |
|
dxfeng
|
a3aadebeeb
|
Merge pull request 'feature/dxf' (#178) from feature/dxf into develop
Reviewed-on: #178
|
2 years ago |
|
dxfeng
|
c3476e3659
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2 years ago |
|
dxfeng
|
38656dde58
|
组织架构图，部门负责人、主次账号
|
2 years ago |
|
dxfeng
|
79f64f7f93
|
组织架构图，列表字段转换、卡片在岗数统计
|
2 years ago |
|
dxfeng
|
46849d161d
|
Merge pull request '组织架构图，人员卡片' (#177) from feature/dxf into develop
Reviewed-on: #177
|
2 years ago |
|
dxfeng
|
49036ba704
|
组织架构图，人员卡片
|
2 years ago |
|
dxfeng
|
e47e8dd330
|
Merge pull request 'feature/dxf' (#176) from feature/dxf into develop
Reviewed-on: #176
|
2 years ago |
|
dxfeng
|
603f7f606a
|
组织架构图，人员卡片
|
2 years ago |
|
dxfeng
|
5559a4322a
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2 years ago |
|
dxfeng
|
e760eae9a0
|
组织架构图，人员卡片
|
2 years ago |
|
liang.cheng
|
dd99d0e0f5
|
Merge pull request '组织架构图' (#175) from feature/cl into develop
Reviewed-on: #175
|
2 years ago |
|
Chengliang
|
9ffd5c3cfb
|
组织架构图
|
2 years ago |
|
liang.cheng
|
d1e4908971
|
Merge pull request '组织架构图' (#174) from feature/cl into develop
Reviewed-on: #174
|
2 years ago |
|
Chengliang
|
2e58769c8b
|
组织架构图
|
2 years ago |
|
dxfeng
|
0592b4dae1
|
Merge pull request '组织架构图重构-异步数据接口;TODO注释清理' (#173) from feature/dxf into develop
Reviewed-on: #173
|
2 years ago |
|
dxfeng
|
d28f1f783c
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2 years ago |
|
dxfeng
|
a2247ddb12
|
TODO注释清理
|
2 years ago |
|
dxfeng
|
c115308f9e
|
组织架构图重构-异步数据接口
|
2 years ago |
|
dxfeng
|
2a6807e855
|
Merge pull request '组织架构图重构-BUG修复' (#172) from feature/dxf into develop
Reviewed-on: #172
|
2 years ago |
|
dxfeng
|
78c4aa5127
|
组织架构图重构-BUG修复
|
2 years ago |
|
dxfeng
|
15e88e5b48
|
Merge pull request '组织架构图重构' (#171) from feature/dxf into develop
Reviewed-on: #171
|
2 years ago |
|
dxfeng
|
c993cafab4
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2 years ago |
|
dxfeng
|
4e919dea65
|
组织架构图重构
|
2 years ago |
|
liang.cheng
|
94de6f7c85
|
Merge pull request '架构图' (#170) from feature/cl into develop
Reviewed-on: #170
|
2 years ago |
|
Chengliang
|
b963913d62
|
架构图
|
2 years ago |
