Mlin
|
971b997dff
|
Merge remote-tracking branch 'origin/develop' into feature/ml
# Conflicts:
# src/com/engine/organization/service/impl/ChartServiceImpl.java
|
2023-07-12 18:04:23 +08:00 |
|
Mlin
|
10a9a350b4
|
组织管理版本记录数据同步
|
2023-07-12 18:00:47 +08:00 |
 dxfeng
|
62b25d6a65
|
组织架构图，回溯详细信息
|
2023-07-12 17:00:01 +08:00 |
|
dxfeng
|
c61a071746
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2023-07-12 16:13:21 +08:00 |
|
dxfeng
|
3bf299afa4
|
组织架构图，回溯详细信息
|
2023-07-12 16:13:08 +08:00 |
 Chengliang
|
81f7ecfec9
|
列表
|
2023-07-12 16:09:04 +08:00 |
|
dxfeng
|
151e77e69b
|
组织架构图，回溯详细信息
|
2023-07-12 11:15:11 +08:00 |
|
dxfeng
|
104d94ba6f
|
组织架构图，回溯数据查询
|
2023-07-12 10:17:06 +08:00 |
|
dxfeng
|
775cf4a8ae
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2023-07-12 10:16:51 +08:00 |
|
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
|
2023-07-11 18:12:24 +08:00 |
|
Mlin
|
38f3e457ef
|
组织管理版本记录0711
|
2023-07-11 18:08:40 +08:00 |
|
Chengliang
|
1a188a1975
|
v3
|
2023-07-11 18:04:08 +08:00 |
|
dxfeng
|
d4a6fb4a28
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2023-07-11 16:12:02 +08:00 |
|
dxfeng
|
075456caa9
|
组织架构图，<根结点>添加回溯联动
|
2023-07-11 16:11:49 +08:00 |
|
Chengliang
|
54abf562a4
|
v3
|
2023-07-11 16:06:23 +08:00 |
|
liang.cheng
|
914649a35b
|
Merge pull request 'v3' (#185) from feature/cl into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/185
|
2023-07-11 15:25:59 +08:00 |
|
Chengliang
|
688eeb125c
|
v3
|
2023-07-11 15:17:56 +08:00 |
|
dxfeng
|
c023822ca5
|
组织架构图，兼容PG数据库
|
2023-07-11 11:19:19 +08:00 |
|
dxfeng
|
a18e7a3dc7
|
组织架构图，添加部门层级条件
|
2023-07-07 14:54:21 +08:00 |
|
dxfeng
|
eb28328219
|
组织架构图，岗位调整为查询聚才林岗位
|
2023-07-07 10:19:59 +08:00 |
|
dxfeng
|
d9ea8fe266
|
修复并发情况下，岗位数据重复问题
|
2023-07-06 17:03:31 +08:00 |
|
dxfeng
|
d2e1cacfa1
|
组织架构图，人员列表添加key
|
2023-07-06 14:10:39 +08:00 |
|
dxfeng
|
7809f9ad3c
|
组织架构图，人员头像
|
2023-07-06 13:55:48 +08:00 |
|
dxfeng
|
436decbc85
|
组织架构图，人员列表显示转换调整
|
2023-07-06 13:30:39 +08:00 |
|
dxfeng
|
38656dde58
|
组织架构图，部门负责人、主次账号
|
2023-07-06 10:47:34 +08:00 |
|
dxfeng
|
79f64f7f93
|
组织架构图，列表字段转换、卡片在岗数统计
|
2023-07-06 10:06:38 +08:00 |
|
dxfeng
|
49036ba704
|
组织架构图，人员卡片
|
2023-07-05 18:13:43 +08:00 |
|
dxfeng
|
603f7f606a
|
组织架构图，人员卡片
|
2023-07-05 17:54:58 +08:00 |
|
dxfeng
|
5559a4322a
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2023-07-05 17:41:47 +08:00 |
|
dxfeng
|
e760eae9a0
|
组织架构图，人员卡片
|
2023-07-05 17:41:30 +08:00 |
|
Chengliang
|
9ffd5c3cfb
|
组织架构图
|
2023-07-05 17:36:04 +08:00 |
|
Chengliang
|
2e58769c8b
|
组织架构图
|
2023-07-05 09:16:17 +08:00 |
|
dxfeng
|
a2247ddb12
|
TODO注释清理
|
2023-07-03 10:50:07 +08:00 |
|
dxfeng
|
c115308f9e
|
组织架构图重构-异步数据接口
|
2023-07-03 10:49:48 +08:00 |
|
dxfeng
|
78c4aa5127
|
组织架构图重构-BUG修复
|
2023-06-30 17:12:58 +08:00 |
|
dxfeng
|
c993cafab4
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2023-06-30 16:45:19 +08:00 |
|
dxfeng
|
4e919dea65
|
组织架构图重构
|
2023-06-30 16:44:56 +08:00 |
|
Chengliang
|
b963913d62
|
架构图
|
2023-06-29 17:37:05 +08:00 |
|
Chengliang
|
2667ab8a60
|
修复条件
|
2023-06-28 17:58:12 +08:00 |
|
Chengliang
|
53a295a468
|
虚拟组织暂存
|
2023-06-27 16:58:45 +08:00 |
|
dxfeng
|
98b85ac75f
|
组织树添加key字段
|
2023-06-27 10:24:51 +08:00 |
|
Chengliang
|
c696835a33
|
搜索条件修改
|
2023-06-27 10:09:05 +08:00 |
|
dxfeng
|
e8d6f2ea73
|
组织架构图搜索条件优化
|
2023-06-27 09:12:41 +08:00 |
|
dxfeng
|
0148d99314
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2023-06-26 17:03:51 +08:00 |
|
Chengliang
|
35d7a045e2
|
组织架构图V3
|
2023-06-26 17:00:12 +08:00 |
|
dxfeng
|
13c39d5fd0
|
Resin编译 异常、警告处理
|
2023-06-21 11:42:21 +08:00 |
|
dxfeng
|
a1dd6126b0
|
岗位新增BUG修复
|
2023-06-09 14:19:32 +08:00 |
|
dxfeng
|
cdd2e6384e
|
人员批量导入 BUG修复
|
2023-06-08 15:56:06 +08:00 |
|
dxfeng
|
7889b866ab
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2023-06-01 14:18:45 +08:00 |
|
dxfeng
|
2ec00b7bb3
|
聚才林岗位新增功能
|
2023-06-01 14:12:12 +08:00 |