Commit Graph

1679 Commits

Author SHA1 Message Date
dxfeng cffa697c2f 组织树 排序BUG修复
like搜索BUG修复
2024-10-23 16:39:01 +08:00
dxfeng 918f2e2a6e 组织架构 排序字段调整为Double 2024-10-21 17:42:05 +08:00
dxfeng 8a843480b6 组织架构 排序字段调整为Double 2024-10-21 17:34:24 +08:00
dxfeng 757b41f8c5 Merge remote-tracking branch 'origin/feature/dxf' into feature/dxf 2024-10-21 15:13:45 +08:00
Chengliang a91bbf74ee 岗位管理数据一致性处理 2024-10-21 15:11:57 +08:00
Chengliang 7595f6bc77 编制对外接口esb缺少UESE对象时默认增加sysadmin 2024-10-21 15:11:57 +08:00
Chengliang aa0d573cc3 定时清除组织管理Delete_type=1的数据 2024-10-21 15:11:57 +08:00
Chengliang 14464744b8 编制信息更新 流程明细处理 新增 2024-10-21 15:11:57 +08:00
dxfeng 95d3dac14f 花名册-组织树排序问题处理 2024-10-21 15:11:57 +08:00
dxfeng 4fcbe238b4 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2024-10-21 15:04:21 +08:00
dxfeng f254feb128 花名册-列定制添加分部 2024-10-21 15:04:06 +08:00
liang.cheng d08192032c Merge pull request 'feature/cl' (#283) from feature/cl into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/283
2024-10-21 10:07:51 +08:00
Chengliang 4d2e8a8035 岗位管理数据一致性处理 2024-10-21 10:06:08 +08:00
Chengliang ea5809ac15 编制对外接口esb缺少UESE对象时默认增加sysadmin 2024-10-15 16:08:48 +08:00
Chengliang b572bc4d48 定时清除组织管理Delete_type=1的数据 2024-10-10 16:38:32 +08:00
liang.cheng e5f46a8083 Merge pull request '编制信息更新 流程明细处理 新增' (#281) from feature/cl into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/281
2024-10-09 13:46:00 +08:00
Chengliang bb021a6f45 编制信息更新 流程明细处理 新增 2024-09-26 15:29:45 +08:00
dxfeng 6c973d86cd 花名册-列定制添加分部 2024-09-13 10:20:52 +08:00
dxfeng 1698f8c8d5 花名册-高级搜索添加多分部 2024-09-12 14:32:52 +08:00
dxfeng e5a30525f0 花名册-Excel导出列展示顺序 2024-09-12 13:24:33 +08:00
liang.cheng 2d240460f1 Merge pull request 'feature/cl' (#279) from feature/cl into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/279
2024-09-12 10:18:11 +08:00
Chengliang 4a8c85cd41 部门负责人多级显示问题处理 2024-09-12 10:15:50 +08:00
Chengliang 035ae80970 花名册导出顺序todo 2024-09-03 11:01:19 +08:00
Chengliang 760b54710a 未启用状态部门列表显示 2.多语言补充 2024-08-30 08:57:22 +08:00
liang.cheng 137273284e Merge pull request 'feature/cl' (#278) from feature/cl into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/278
2024-08-27 15:48:36 +08:00
Chengliang 4fd548d777 1.导出增加组织全路径 2024-08-27 09:26:32 +08:00
Chengliang c0669d1f58 1.pgsql修复 2.花名册列定制增加组织全路径 2024-08-26 15:55:45 +08:00
Chengliang a939a6f222 岗位编号增加部门id拼接 2024-08-26 09:29:55 +08:00
Chengliang 19f8cefe8a 编制对外接口 自动释放冻结数取消 2024-08-22 13:45:53 +08:00
Chengliang a303b748b5 组织树字段id为null校验 2024-08-21 10:11:07 +08:00
liang.cheng 096f1d1c6b Merge pull request '1.分权增加角色功能' (#277) from feature/cl into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/277
2024-08-20 15:24:55 +08:00
Chengliang 517c3135af 1.分权增加角色功能 2024-08-20 15:23:50 +08:00
liang.cheng b65dcb9fa2 Merge pull request '分权增加角色' (#276) from feature/cl into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/276
2024-08-19 17:18:09 +08:00
Chengliang 82fd63c1a1 分权增加角色 2024-08-19 17:16:24 +08:00
liang.cheng 63df0e596f Merge pull request 'feature/cl' (#275) from feature/cl into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/275
2024-08-14 17:05:41 +08:00
Chengliang 53afce795a 组织编制信息导入bug修复 2024-08-14 17:04:38 +08:00
Chengliang 1705857817 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/cl 2024-08-13 10:31:45 +08:00
Chengliang 2114368acc 组织编制信息导入bug修复 2024-08-13 10:31:20 +08:00
liang.cheng 50c7a9373e Merge pull request 'feature/cl' (#274) from feature/cl into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/274
2024-08-08 16:16:26 +08:00
Chengliang 2ea741211f 组织非标去除浏览按钮展示虚拟组织 2024-08-08 16:15:10 +08:00
Chengliang 816601407c Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/cl 2024-08-06 15:51:35 +08:00
dxfeng d865bb976b 组织架构图,根结点为部门时,层级问题处理 2024-08-06 15:51:04 +08:00
Chengliang 94994972e3 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/cl 2024-08-06 15:08:44 +08:00
dxfeng 4dd6a99c1d Merge branch 'feature/dxf' into develop 2024-08-06 11:02:06 +08:00
dxfeng fe60767829 组织架构图,根结点为部门时,层级问题处理 2024-08-06 11:00:51 +08:00
dxfeng 5c05759ad4 组织架构图,根结点为部门时,层级问题处理 2024-08-06 09:59:18 +08:00
Chengliang 868a973bc5 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/cl 2024-08-05 16:06:11 +08:00
dxfeng 6ccb4ec3d3 Merge branch 'feature/dxf' into develop 2024-08-05 15:12:48 +08:00
dxfeng be807d032b 编制方案、编制信息分权 2024-08-05 15:11:54 +08:00
dxfeng ad9e80e1e8 根结点树,增加部门节点数据 2024-08-05 14:56:25 +08:00