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

668 Commits

Author SHA1 Message Date
dxfeng aa3d0742ff 分部接口整理、代码优化 2022-11-28 11:15:54 +08:00
dxfeng 416471a283 分部列表、新增、删除、转移功能重写 2022-11-24 17:56:32 +08:00
dxfeng f7758e5298 人员导入提示信息优化 2022-11-23 09:34:06 +08:00
dxfeng 5d2b880ed5 人员同步BUG修复，导入优化 2022-11-22 09:41:11 +08:00
dxfeng ae2e5bb5a4 人员Mapper整合 2022-11-21 10:58:12 +08:00
dxfeng 7d1fc84fad 组织架构树排序、人员卡片BUG修复 2022-11-18 16:28:02 +08:00
dxfeng e45ff3daa3 导入BUG，提示信息优化 2022-11-17 17:02:45 +08:00
dxfeng 25d3db4d81 导入BUG，提示信息优化 2022-11-17 15:36:26 +08:00
dxfeng a273008715 导入BUG，提示信息优化 2022-11-17 11:36:52 +08:00
dxfeng 0404c4b7fd 导入自动编号 2022-11-17 09:05:00 +08:00
dxfeng 47c09cac9a 导入自动编号 2022-11-16 17:54:57 +08:00
dxfeng 81943df058 编制、分部树排序 2022-11-16 17:39:58 +08:00
dxfeng 9b20c6838a 人事卡片按钮权限BUG 2022-11-16 16:09:32 +08:00
dxfeng 49b4358e17 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2022-11-16 15:24:34 +08:00
dxfeng f9f5bc432c BUG修复 2022-11-16 15:23:56 +08:00
‘ml’ b5d5b717d1 职务导入提示优化修复20221116 2022-11-16 15:14:11 +08:00
dxfeng 17f4789e33 BUG修复 2022-11-16 14:59:22 +08:00
dxfeng 67fd2df4f9 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2022-11-16 14:58:48 +08:00
liang.cheng b3bfad0148 Merge pull request '“栏目表格修复”' (#65) from feature/cl into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/65
 2022-11-16 14:08:40 +08:00
Chengliang cb4db723e4 “栏目表格修复” 2022-11-16 14:06:12 +08:00
dxfeng 05364f9265 BUG修复 2022-11-16 13:39:56 +08:00
‘ml’ caa9604315 职级导入异常处理方案1116 2022-11-16 11:22:28 +08:00
dxfeng bb071c3ad9 Merge pull request '花名册树、角色展示、组织透视下拉框' (#64) from feature/dxf into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/64
 2022-11-15 14:35:16 +08:00
dxfeng 2d64a5015b 组织透视下拉框BUG 2022-11-15 14:34:16 +08:00
‘ml’ 706edd43ed 职级导入提示优化1115 2022-11-15 14:24:06 +08:00
dxfeng 4fc2eca27b 花名册树、角色展示BUG 2022-11-15 11:47:54 +08:00
dxfeng f1a3565fc7 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2022-11-15 08:56:58 +08:00
dxfeng 10bb8159aa 明细表BUG修复 2022-11-14 19:13:35 +08:00
‘ml’ 0bcdbc9de8 Merge remote-tracking branch 'origin/develop' into feature/ml 2022-11-14 17:30:06 +08:00
‘ml’ 306897c5bc 职务导入模板提示修复1114 2022-11-14 17:29:55 +08:00
dxfeng 7c79718d6e 人员卡片，修改字段名 2022-11-14 14:05:48 +08:00
dxfeng 3ec8afe78b 人员卡片，明细表展示 2022-11-14 13:56:19 +08:00
dxfeng 7b5a4905dc BUG修复、卡片按钮排序 2022-11-14 11:19:08 +08:00
‘ml’ af6d920b59 职务导入模板生成 2022-11-11 17:31:17 +08:00
dxfeng 4a0ddd8adc Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2022-11-11 17:24:55 +08:00
dxfeng cd11f06b7f 卡片按钮新增、删除 2022-11-11 17:24:22 +08:00
liang.cheng c9b82b5f71 Merge pull request 'bug修复' (#56) from feature/cl into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/56
 2022-11-11 16:55:29 +08:00
Chengliang d236127f31 bug修复 2022-11-11 16:52:01 +08:00
‘ml’ 091f202eac 职务导入 2022-11-11 16:50:35 +08:00
dxfeng 16794bf98c 人员卡片按钮保存 2022-11-11 16:24:26 +08:00
dxfeng 854a40b7cd 人员卡片按钮自定义 2022-11-11 14:11:34 +08:00
dxfeng b7217dae23 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2022-11-11 14:00:08 +08:00
dxfeng d16f13405c 人员卡片按钮自定义 2022-11-11 13:59:45 +08:00
‘ml’ 1baf55e04f 职级职等导入更新 2022-11-11 13:35:00 +08:00
‘ml’ 9517ad15d6 优化职级模板字段顺序 2022-11-11 10:36:49 +08:00
‘ml’ ba2434b130 Merge remote-tracking branch 'origin/develop' into feature/ml 2022-11-11 09:11:25 +08:00
‘ml’ 0459c628ea 职等职级导入接口20221111 2022-11-11 09:11:03 +08:00
dxfeng 57d788d807 人员卡片按钮权限 2022-11-11 09:09:53 +08:00
Chengliang 8e93568aa4 bug修复 2022-11-10 14:07:50 +08:00
‘ml’ 0da123fcef Merge branch 'feature/ml' into develop 
# Conflicts:
#	src/com/engine/organization/service/impl/ImportCommonServiceImpl.java
 2022-11-10 10:58:00 +08:00
‘ml’ ec8be58a45 职等职级导入接口 2022-11-10 10:55:56 +08:00
Chengliang eeefde07ed 接口 2022-11-10 10:29:03 +08:00
dxfeng fa1434a64a 卡片分组权限 2022-11-10 10:28:14 +08:00
dxfeng dcf8418edb 代码还原 2022-11-10 10:24:48 +08:00
dxfeng 0e41f08327 组织架构图搜索下拉框、集团负责人BUG修复 2022-11-09 18:50:39 +08:00
‘ml’ ddafc854b6 修复组织机构图虚拟组织不显示 2022-11-09 18:48:42 +08:00
dxfeng 466ba43b31 人员卡片类别展示权限控制 2022-11-09 16:58:09 +08:00
dxfeng a6952f41b0 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2022-11-09 11:13:55 +08:00
dxfeng b0021dae20 字段允许个人修改 2022-11-09 11:07:55 +08:00
liang.cheng c2a1908c10 Merge pull request 'bug修复' (#44) from feature/cl into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/44
 2022-11-09 09:54:03 +08:00
Chengliang 99f849f350 bug修复 2022-11-09 09:45:19 +08:00
dxfeng a3a0ce8046 岗位按钮、人员字段权限 2022-11-08 17:26:59 +08:00
dxfeng 3813c8b54a Merge pull request '岗位按钮、组织架构图 BUG修复' (#43) from feature/dxf into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/43
 2022-11-08 15:26:13 +08:00
dxfeng 9a163f1742 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2022-11-08 15:21:51 +08:00
dxfeng c03a7c599a 岗位按钮、组织架构图 BUG修复 2022-11-08 15:21:29 +08:00
Chengliang dc347c755d 人员卡片菜单权限接口 2022-11-08 09:23:53 +08:00
dxfeng df0d688e6f 分权BUG修复 2022-11-03 16:51:56 +08:00
dxfeng 31645b34fe 分权BUG修复 2022-11-03 16:45:02 +08:00
dxfeng ffe09c8933 组织架构图，不展示手机、地址、部门 2022-11-03 14:54:14 +08:00
dxfeng 85e39fd564 分权BUG修复 2022-11-03 14:19:37 +08:00
dxfeng 373eebe5d8 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2022-11-03 11:11:04 +08:00
dxfeng 47aafefa5a 分权BUG修复 2022-11-03 11:06:36 +08:00
‘ml’ 5e981c8163 Merge remote-tracking branch 'origin/develop' into feature/ml 2022-11-02 20:19:16 +08:00
‘ml’ 7d88bb9d5b 虚拟组织(新增修改删除接口) 2022-11-02 20:18:55 +08:00
liang.cheng 41370fe770 Merge pull request '人员卡片权限接口' (#37) from feature/cl into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/37
 2022-11-02 17:46:38 +08:00
Chengliang afcbbcefb1 人员卡片权限接口 2022-11-02 17:44:52 +08:00
dxfeng 18767b722c 聚才林岗位分权 2022-11-02 14:30:22 +08:00
liang.cheng 121927dba8 Merge pull request '人员卡片类型权限' (#35) from feature/cl into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/35
 2022-11-02 11:31:54 +08:00
Chengliang b636dc2b82 人员卡片类型权限 2022-11-02 11:29:40 +08:00
dxfeng f6779ec20a Merge pull request '组织架构图分权功能' (#34) from feature/dxf into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/34
 2022-11-02 11:00:18 +08:00
dxfeng be90013ca0 组织架构图分权功能 2022-11-02 10:55:15 +08:00
liang.cheng ac5eb30534 Merge pull request '人员卡片权限' (#33) from feature/cl into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/33
 2022-11-01 17:55:07 +08:00
Chengliang 4e4cf54f8a 人员卡片权限 2022-11-01 17:53:31 +08:00
dxfeng 895528617b 分部、部门、岗位、人员 分权功能开发 2022-11-01 10:05:43 +08:00
dxfeng 955134dc28 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 
 Conflicts:
	src/com/engine/organization/service/impl/ManagerDetachServiceImpl.java
 2022-10-31 11:40:05 +08:00
dxfeng 0b3cd0641b 分权开发 2022-10-28 17:43:46 +08:00
Chengliang 1e08772a9d 分权开关设置 2022-10-28 17:41:56 +08:00
dxfeng 40f1f097e6 代码合并 2022-10-28 10:35:33 +08:00
liang.cheng 19cccb9345 Merge pull request 'feature/detach' (#29) from feature/detach into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/29
 2022-10-28 09:36:40 +08:00
dxfeng 3989161281 组织架构图相关BUG修复 2022-10-27 19:11:58 +08:00
Chengliang 47c64b6797 模块管理分权 2022-10-27 15:06:50 +08:00
Chengliang ef392f4d0a 模块管理分权 2022-10-27 15:00:12 +08:00
‘ml’ 1be79b9698 分部、部门、岗位禁用修复1024 2022-10-27 15:00:07 +08:00
‘ml’ 939e6c7607 分部转移、部门转移、岗位合并修复1021 2022-10-27 14:59:57 +08:00
Chengliang 96cefec891 模块管理分权 2022-10-27 14:58:44 +08:00
Chengliang f6ea4425cf 模块管理分权 2022-10-27 14:58:44 +08:00
Chengliang 4c74b583bf 模块管理分权 2022-10-27 14:58:44 +08:00
Chengliang 2b975e6636 模块管理分权中心接口 2022-10-27 14:58:44 +08:00
dxfeng 92b246b5d5 组织架构图相关BUG修复 2022-10-27 14:39:35 +08:00
dxfeng 679c77f732 组织架构图相关BUG修复 2022-10-26 20:12:14 +08:00
dxfeng 7258ee742d 编制模板优化 2022-10-25 16:24:18 +08:00
dxfeng b2fc9d3e0c 人员编号、岗位部门、自定义下拉框BUG修复 2022-10-25 15:43:02 +08:00
dxfeng eeb21315c7 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2022-10-25 11:29:05 +08:00
dxfeng a36648ea39 花名册树BUG 2022-10-25 11:09:14 +08:00
‘ml’ f2c5d1227b 分部、部门、岗位禁用、合并修复1025 2022-10-25 10:47:08 +08:00
‘ml’ e198209705 Merge remote-tracking branch 'origin/develop' into feature/ml 2022-10-25 09:03:16 +08:00
dxfeng 594173175c 更新人员Map表信息 2022-10-25 08:59:24 +08:00
dxfeng b446dbdb53 人员导入、花名册左侧树BUG修复 2022-10-24 19:06:07 +08:00
‘ml’ f30998351f Merge remote-tracking branch 'origin/develop' into feature/ml 
# Conflicts:
#	src/com/engine/organization/thread/CompanyTriggerRunnable.java
#	src/com/engine/organization/thread/DepartmentTriggerRunnable.java
 2022-10-24 16:01:51 +08:00
‘ml’ 65ccecce56 分部、部门、岗位禁用修复1024 2022-10-24 16:00:00 +08:00
dxfeng dca18ea5b1 编制导入模板、人员卡片、组织架构图Oracle 2022-10-24 15:57:08 +08:00
dxfeng 3b4c59ae8c 人员相关BUG修复 2022-10-21 17:44:53 +08:00
dxfeng 2515121d83 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2022-10-21 15:58:13 +08:00
dxfeng 11a4a85ff1 人员关联调整 2022-10-21 15:57:55 +08:00
‘ml’ 05fe14b5e1 分部转移、部门转移、岗位合并修复1021 2022-10-21 15:53:15 +08:00
‘ml’ 887a1eafe3 Merge remote-tracking branch 'origin/develop' into feature/ml 2022-10-21 09:47:27 +08:00
dxfeng 52c8b86adb 人员关联调整 2022-10-21 09:28:33 +08:00
‘ml’ 9a9b79cff0 Merge remote-tracking branch 'origin/develop' into feature/ml 2022-10-20 17:31:23 +08:00
‘ml’ a0660a7857 分部转移、部门转移、岗位合并修复1020 2022-10-20 17:30:34 +08:00
dxfeng b7e34c1d31 人员关联调整 2022-10-20 09:07:32 +08:00
dxfeng a5687b3995 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2022-10-19 15:42:01 +08:00
‘ml’ adc92c8287 部门合并在岗数优化1019 2022-10-19 15:38:47 +08:00
dxfeng eb007f5b23 人事卡片BUG修复 2022-10-18 16:35:08 +08:00
‘ml’ 5005243758 部门合并在岗数优化 2022-10-18 12:17:11 +08:00
dxfeng 414aefe41c 人事卡片BUG修复 2022-10-18 11:41:11 +08:00
dxfeng 63b6b88a96 人员管理BUG修复 2022-10-17 17:16:26 +08:00
dxfeng 396a4570d0 BUG修复 2022-10-17 11:35:46 +08:00
dxfeng cd4d2c77bf 人员卡片BUG修复 2022-10-17 09:36:08 +08:00
dxfeng f36756e1fd 分部、岗位 禁用功能限制 2022-10-14 14:56:35 +08:00
dxfeng 4a85fc46aa 部门转移BUG修复 2022-10-14 11:33:24 +08:00
dxfeng 1d7389c872 人员卡片 2022-10-14 11:06:15 +08:00
dxfeng f9c33da655 人员管理完善 2022-10-14 09:13:28 +08:00
dxfeng 46068ab008 编制Action 添加提示信息，BUG修复 2022-10-13 13:59:41 +08:00
dxfeng c538a6205f Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2022-10-12 15:28:32 +08:00
dxfeng 3ac7c2b959 聚才林花名册 2022-10-12 15:28:11 +08:00
dxfeng f26159506a 岗位浏览按钮、编制action BUG修复 2022-10-12 15:23:24 +08:00
‘ml’ c78f2157f8 层级显示不一致优化 2022-10-10 18:24:07 +08:00
Chengliang eb5578fd64 编制删除 2022-10-10 17:35:48 +08:00
dxfeng 9df3349715 兼容EC岗位名称重复 2022-10-09 15:36:53 +08:00
dxfeng 231addfda1 人事卡片接口开发 2022-10-09 11:42:26 +08:00
dxfeng 284f778963 人员调整,在岗数关联优化 2022-09-30 15:19:22 +08:00
dxfeng acee0bad51 人员调整,在岗数关联优化 2022-09-30 11:05:42 +08:00
dxfeng c6fb0d129b 组织架构图编制、在岗,数据优化 2022-09-29 15:57:00 +08:00
Chengliang ca3a093357 bug 2022-09-29 10:28:04 +08:00
dxfeng 02836ce37d 岗位名称校验、编制展示优化、BUG修复 2022-09-23 15:53:37 +08:00
dxfeng 92d9a17d8c 组织架构图编制显示优化 2022-09-23 09:19:42 +08:00
dxfeng 106d7e8bb8 更新人员、编制 同步组织架构图 2022-09-21 16:23:09 +08:00
dxfeng 7eb7a93397 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2022-09-21 10:45:26 +08:00
dxfeng a847a4efef 兼容Oracle,达梦 2022-09-21 10:43:41 +08:00
dxfeng 8a9370ee9e BUG修复 2022-09-20 18:46:05 +08:00