Commit Graph

554 Commits (76f1501a2818a088202d14a49b801f8794ccf0dc)

Author SHA1 Message Date
dxfeng 946354b32d BUG修复 2 years ago
Mlin 1db1949a94 Merge remote-tracking branch 'origin/develop' into feature/ml 2 years ago
Mlin 43f00f7d9d sqlserver存入版本修复、定时任务 2 years ago
dxfeng 4117a34928 BUG修复 2 years ago
dxfeng 8383c08a06 BUG修复 2 years ago
dxfeng b9d06b4246 分权功能版本回退,岗位BUG修复 2 years ago
Mlin 5897ae1563 Merge remote-tracking branch 'origin/develop' into feature/ml 2 years ago
Mlin e81d8f4939 oracle、sqlserver查询版本语句 2 years ago
dxfeng fab4614cd5 分权功能重构,调用EC方法 2 years ago
dxfeng ce2c34cfdd BUG修复,岗位关联关系调整 2 years ago
dxfeng 32fd42db2f Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2 years ago
dxfeng b64f15bd83 BUG修复,岗位关联关系调整 2 years ago
Mlin 2b549bcc4a 人员版本控制写入逻辑 2 years ago
dxfeng 6169b007ae Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2 years ago
Mlin 32e8eb4890 分部、部门版本控制写入逻辑 2 years ago
Mlin 1bdc7e2fa4 Merge remote-tracking branch 'origin/develop' into feature/ml 2 years ago
Mlin 13ae136872 部门版本控制写入逻辑 2 years ago
dxfeng 45a24cb0be BUG修复,岗位关联关系调整 2 years ago
dxfeng 06c9912d21 BUG修复,岗位关联关系调整 2 years ago
dxfeng 3470ba04cd 岗位关联关系调整 2 years ago
Mlin 73dbaf75ac 分部版本控制写入逻辑 2 years ago
dxfeng c1c812596d BUG修复 2 years ago
dxfeng eaa1c53c9c 分部、部门联调。BUG修复 2 years ago
dxfeng f89ebdb965 分部、部门联调。BUG修复 2 years ago
dxfeng a1f2c9d1ac BUG修复 2 years ago
dxfeng ea8a48099f Merge pull request '人员导入逻辑重写' (#87) from feature/dxf into develop
Reviewed-on: #87
2 years ago
dxfeng 668231fd61 人员导入逻辑重写 2 years ago
Chengliang d345a5fe66 版本管理 2 years ago
dxfeng 37dc31b7b5 部门查看、编辑接口调整 2 years ago
dxfeng 6fc67d7d67 分部查看、编辑接口调整 2 years ago
dxfeng 64af65cad3 部门导入新增、更新 2 years ago
dxfeng 324881794b 分部导入新增、更新 2 years ago
dxfeng 54c3676c07 分部BUG修复,导入接口逻辑重写 2 years ago
dxfeng 85ec966813 人员卡片查看页面逻辑重写 2 years ago
dxfeng fb17f43323 部门管理功能逻辑调整 2 years ago
dxfeng bd33075e14 部门管理功能逻辑调整 2 years ago
dxfeng 40a6540a1d 部门管理功能逻辑调整 2 years ago
dxfeng 238d8e6f75 部门接口逻辑调整 2 years ago
dxfeng 9a2eabc8bd 部门切换数据源、实体类更新 2 years ago
dxfeng aa3d0742ff 分部接口整理、代码优化 2 years ago
dxfeng 416471a283 分部列表、新增、删除、转移功能重写 2 years ago
dxfeng f7758e5298 人员导入提示信息优化 2 years ago
dxfeng 5d2b880ed5 人员同步BUG修复,导入优化 2 years ago
dxfeng ae2e5bb5a4 人员Mapper整合 2 years ago
dxfeng e45ff3daa3 导入BUG,提示信息优化 2 years ago
dxfeng 25d3db4d81 导入BUG,提示信息优化 2 years ago
dxfeng a273008715 导入BUG,提示信息优化 2 years ago
dxfeng 0404c4b7fd 导入自动编号 2 years ago
dxfeng 47c09cac9a 导入自动编号 2 years ago
dxfeng 81943df058 编制、分部树排序 2 years ago
dxfeng 9b20c6838a 人事卡片按钮权限BUG 2 years ago
dxfeng f9f5bc432c BUG修复 2 years ago
dxfeng 67fd2df4f9 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2 years ago
dxfeng 05364f9265 BUG修复 2 years ago
‘ml’ caa9604315 职级导入异常处理方案1116 2 years ago
dxfeng bb071c3ad9 Merge pull request '花名册树、角色展示、组织透视下拉框' (#64) from feature/dxf into develop
Reviewed-on: #64
2 years ago
dxfeng 2d64a5015b 组织透视下拉框BUG 2 years ago
‘ml’ 706edd43ed 职级导入提示优化1115 2 years ago
dxfeng f1a3565fc7 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2 years ago
dxfeng 10bb8159aa 明细表BUG修复 2 years ago
‘ml’ 0bcdbc9de8 Merge remote-tracking branch 'origin/develop' into feature/ml 2 years ago
‘ml’ 306897c5bc 职务导入模板提示修复1114 2 years ago
dxfeng 7c79718d6e 人员卡片,修改字段名 2 years ago
dxfeng 3ec8afe78b 人员卡片,明细表展示 2 years ago
dxfeng 7b5a4905dc BUG修复、卡片按钮排序 2 years ago
‘ml’ af6d920b59 职务导入模板生成 2 years ago
dxfeng 4a0ddd8adc Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2 years ago
dxfeng cd11f06b7f 卡片按钮新增、删除 2 years ago
Chengliang d236127f31 bug修复 2 years ago
dxfeng 16794bf98c 人员卡片按钮保存 2 years ago
dxfeng 854a40b7cd 人员卡片按钮自定义 2 years ago
dxfeng b7217dae23 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2 years ago
dxfeng d16f13405c 人员卡片按钮自定义 2 years ago
‘ml’ 1baf55e04f 职级职等导入更新 2 years ago
‘ml’ 9517ad15d6 优化职级模板字段顺序 2 years ago
‘ml’ ba2434b130 Merge remote-tracking branch 'origin/develop' into feature/ml 2 years ago
‘ml’ 0459c628ea 职等职级导入接口20221111 2 years ago
dxfeng 57d788d807 人员卡片按钮权限 2 years ago
Chengliang 8e93568aa4 bug修复 2 years ago
‘ml’ 0da123fcef Merge branch 'feature/ml' into develop
# Conflicts:
#	src/com/engine/organization/service/impl/ImportCommonServiceImpl.java
2 years ago
‘ml’ ec8be58a45 职等职级导入接口 2 years ago
Chengliang eeefde07ed 接口 2 years ago
dxfeng fa1434a64a 卡片分组权限 2 years ago
dxfeng dcf8418edb 代码还原 2 years ago
dxfeng 0e41f08327 组织架构图搜索下拉框、集团负责人BUG修复 2 years ago
‘ml’ ddafc854b6 修复组织机构图虚拟组织不显示 2 years ago
dxfeng 466ba43b31 人员卡片类别展示权限控制 2 years ago
dxfeng a6952f41b0 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2 years ago
dxfeng b0021dae20 字段允许个人修改 2 years ago
liang.cheng c2a1908c10 Merge pull request 'bug修复' (#44) from feature/cl into develop
Reviewed-on: #44
2 years ago
Chengliang 99f849f350 bug修复 2 years ago
dxfeng a3a0ce8046 岗位按钮、人员字段权限 2 years ago
dxfeng 3813c8b54a Merge pull request '岗位按钮、组织架构图 BUG修复' (#43) from feature/dxf into develop
Reviewed-on: #43
2 years ago
dxfeng 9a163f1742 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2 years ago
dxfeng c03a7c599a 岗位按钮、组织架构图 BUG修复 2 years ago
Chengliang dc347c755d 人员卡片菜单权限接口 2 years ago
dxfeng df0d688e6f 分权BUG修复 3 years ago
dxfeng 31645b34fe 分权BUG修复 3 years ago
dxfeng ffe09c8933 组织架构图,不展示手机、地址、部门 3 years ago
dxfeng 9b36018c9a Merge pull request '分权BUG修复' (#38) from feature/dxf into develop
Reviewed-on: #38
3 years ago