Commit Graph

1065 Commits

Author SHA1 Message Date
Chengliang 7595f6bc77 编制对外接口esb缺少UESE对象时默认增加sysadmin 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 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
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
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
Chengliang 517c3135af 1.分权增加角色功能 2024-08-20 15:23:50 +08:00
Chengliang 82fd63c1a1 分权增加角色 2024-08-19 17:16:24 +08:00
Chengliang 53afce795a 组织编制信息导入bug修复 2024-08-14 17:04:38 +08:00
Chengliang 2114368acc 组织编制信息导入bug修复 2024-08-13 10:31:20 +08:00
Chengliang 2ea741211f 组织非标去除浏览按钮展示虚拟组织 2024-08-08 16:15:10 +08:00
dxfeng d865bb976b 组织架构图,根结点为部门时,层级问题处理 2024-08-06 15:51:04 +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
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
liang.cheng 58b57c81b7 Merge pull request '组织架构图增加定时任务存储和删除功能' (#273) from feature/cl into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/273
2024-08-02 16:49:23 +08:00
Chengliang 06a3d5b225 组织架构图增加定时任务存储和删除功能 2024-08-02 16:45:57 +08:00
dxfeng fc79e336c0 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into develop 2024-08-02 14:55:04 +08:00
dxfeng 51d34bd496 Merge branch 'feature/dxf' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2024-08-02 14:53:45 +08:00
dxfeng d3f87a3a07 根结点树,增加部门节点数据 2024-08-02 14:53:20 +08:00
dxfeng a6b10dcd8e 根结点树,增加部门节点数据 2024-08-02 14:15:58 +08:00
Chengliang a7ee4e47a3 花名册整体修复 2024-07-25 18:51:29 +08:00
dxfeng 6af0092549 导出列根据模板生成 2024-07-25 16:56:03 +08:00
Chengliang 555e3dd604 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/cl 2024-07-25 10:57:24 +08:00
Chengliang 710d6f5000 花名册修复 2024-07-25 10:55:39 +08:00
dxfeng af6b076584 高级搜索 当前使用模板 2024-07-25 10:52:58 +08:00
Chengliang 07b3bd5ae7 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/cl 2024-07-24 17:54:44 +08:00
Chengliang 15726f1824 高级搜索字段展示去除未启用字段 2024-07-24 17:54:03 +08:00
dxfeng b58378854b 列定制 全局模板 2024-07-24 17:53:14 +08:00
Chengliang ec84cd6ccf 测试 2024-07-24 15:41:32 +08:00
Chengliang 5a230ea962 模板一键应用所有人 2024-07-23 10:02:43 +08:00
Chengliang 7bc3a97bbb 统一消息返回原方法保留 2024-07-22 16:59:30 +08:00
dxfeng 50b7845f26 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
 Conflicts:
	src/com/engine/organization/entity/staff/vo/StaffPlanTableVO.java
2024-07-17 18:19:23 +08:00
dxfeng 93d672f14c 禁用BUG修复 2024-07-17 18:18:03 +08:00
liang.cheng f033e08f0b Merge pull request '1.编制信息增加定时任务更新在编数' (#267) from feature/cl into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/267
2024-07-16 16:42:50 +08:00
Chengliang edfbdc9cb9 1.编制信息增加定时任务更新在编数
2.增加usekind筛选人员
2024-07-16 16:40:17 +08:00
dxfeng 51dac61a21 多语言BUG修复 2024-07-16 14:34:48 +08:00
dxfeng 0e53d8221d Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2024-07-16 09:12:02 +08:00
dxfeng 97a3c34159 BUG修复-花名册动态搜索条件BUG修复 2024-07-16 09:11:39 +08:00