liang.cheng
/
weaver-hrm-organization
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,456 Commits 23 Branches 0 Tags 6.7 MiB
Commit Graph

62 Commits

Author SHA1 Message Date
Mlin 9f41a40d6e 组织架构图：在编数bug优化 2023-09-14 13:39:39 +08:00
Chengliang f78ba6f6b3 组织架构图 2023-09-14 11:05:39 +08:00
liang.cheng ef71054c94 Merge pull request '组织架构图改造' (#217) from feature/cl into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/217
 2023-09-13 18:07:35 +08:00
Chengliang 33c3b0ccaf 组织架构图改造 2023-09-13 18:04:09 +08:00
Mlin 9e11f30ac2 Merge remote-tracking branch 'origin/feature/ml' into develop 2023-09-13 13:35:18 +08:00
Mlin 57b6542a34 组织架构图：在编数 2023-09-13 13:31:44 +08:00
liang.cheng e57af84b06 Merge pull request '组织架构图人数统计' (#216) from feature/cl into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/216
 2023-09-12 11:23:11 +08:00
Chengliang 3c43bfa465 组织架构图人数统计 2023-09-12 11:20:20 +08:00
Mlin 29bfc3002e 存为版本：在岗数、在编数 2023-09-12 10:24:44 +08:00
dxfeng 2bcc0ae131 组织架构图显示部门 2023-08-17 14:21:43 +08:00
dxfeng 17b9c57649 组织架构图排序 2023-08-14 15:22:21 +08:00
dxfeng 82d6cc74db 组织调整树BUG修复 2023-08-02 14:53:53 +08:00
dxfeng d068aa6bc1 组织管理，树结构展开功能完善、分部删除BUG修复 2023-08-02 11:29:19 +08:00
dxfeng 647f692920 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2023-08-01 14:05:41 +08:00
dxfeng 04826fcaa4 组织管理，树结构展开功能完善 2023-08-01 14:05:17 +08:00
Mlin 315a67173d Merge remote-tracking branch 'origin/develop' into feature/ml 2023-08-01 09:41:55 +08:00
dxfeng 9a6f0a845e 组织管理，架构图树排序、BUG修复 2023-07-31 17:45:42 +08:00
dxfeng ea4a3201aa 组织管理，架构图部门树选择数据接口 2023-07-31 10:55:20 +08:00
dxfeng e011880672 组织管理，树结构禁用非部门节点 2023-07-31 10:02:38 +08:00
Mlin 50ee698cc2 Merge remote-tracking branch 'origin/develop' into feature/ml 2023-07-31 09:44:19 +08:00
dxfeng 59d4fac4e2 组织管理，部门封存传参，树结构优化 2023-07-31 09:29:10 +08:00
dxfeng 3fa679b139 组织管理，树结构兼容是否封存 2023-07-27 17:45:02 +08:00
dxfeng 1280b3c6b9 组织管理，TreeSelect组件全量接口开发 2023-07-27 14:32:07 +08:00
dxfeng b1b24fc925 组织管理，移动树接口提交 2023-07-26 11:23:15 +08:00
dxfeng 9610361733 组织管理，移动树接口提交 2023-07-26 10:52:10 +08:00
dxfeng fab01583ad 组织架构图，部门选择树 2023-07-24 16:38:17 +08:00
Mlin 2ee38ccc0c 版本管理代码优化 2023-07-17 14:30:44 +08:00
Mlin 775405741a 版本管理，事务控制bug优化 2023-07-14 15:00:49 +08:00
Mlin 0a809a29c9 版本管理，事务控制bug优化 2023-07-14 14:46:05 +08:00
Mlin 1abbc7cddf 版本记录，未新增分部类型、部门类型字段时同步bug修复 2023-07-14 11:40:04 +08:00
Mlin 8ac0f45d29 版本记录，虚拟人员bug修复 2023-07-13 18:05:17 +08:00
Mlin 3d7b5927b3 版本记录，虚拟人员bug修复 2023-07-13 17:51:16 +08:00
Mlin 45b663217f 版本记录，分部bug修复 2023-07-13 17:16:22 +08:00
Mlin 7d1b7b8795 版本记录，虚拟人员bug修复 2023-07-13 16:58:22 +08:00
dxfeng d510f32bc5 组织架构图，BUG修复 2023-07-13 15:26:11 +08:00
Mlin 725d64888c 组织管理版本记录int类型bug修复 2023-07-13 11:08:22 +08:00
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
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 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