Commit Graph

731 Commits (dc0c823caf4155e6cc47ec3174cf1e55b467fb69)

Author SHA1 Message Date
Mlin a5cc902c10 oracle环境存入版本bug修复 2 years ago
dxfeng b11251701a BUG修复 2 years ago
Mlin afe4813427 Merge remote-tracking branch 'origin/develop' into feature/ml 2 years ago
Mlin 78d08ea740 无历史版本返回为空 2 years ago
dxfeng c86e37495d Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2 years ago
dxfeng b9cfe839e7 BUG修复 2 years ago
Mlin 78dfc87f61 同步数据接口 2 years ago
Mlin 0b89abeaac Merge remote-tracking branch 'origin/develop' into feature/ml 2 years ago
Mlin 981ea3ad4a 存为版本取消存入map表,同步接口 2 years ago
dxfeng 434dbacb64 根据职等职级字段,补充人员信息 2 years ago
dxfeng f428dff5a0 根据职等职级字段,补充人员信息 2 years ago
Mlin 8cda66dc8b bug修复 2 years ago
Mlin 241bf47710 Merge remote-tracking branch 'origin/develop' into feature/ml 2 years ago
Mlin 184a9e375f 版本查询接口二版 2 years ago
liang.cheng afa66c74c1 Merge pull request '岗位刷新功能' (#100) from feature/cl into develop
Reviewed-on: #100
2 years ago
Mlin 95d53a6d8c Merge remote-tracking branch 'origin/develop' into feature/ml 2 years ago
Mlin faaed265fe 版本查询接口初版 2 years ago
Chengliang 4105600770 岗位刷新功能 2 years ago
Chengliang 4d8948724e 岗位增加刷新按钮 2 years ago
dxfeng e26e780310 Merge pull request 'BUG修复' (#98) from feature/dxf into develop
Reviewed-on: #98
2 years ago
dxfeng 1db4a85d46 BUG修复 2 years ago
Mlin 569a3132c1 分部、部门、人员封存后取消架构图展示 2 years ago
Mlin 3be6bf11a2 Merge remote-tracking branch 'origin/develop' into feature/ml 2 years ago
Mlin b3057e2f4e 版本查询接口 2 years ago
Mlin 3462511603 showOrder类型小数转换 2 years ago
dxfeng 550be7fb14 BUG修复 2 years ago
dxfeng 42545745fe Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2 years ago
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修复 3 years ago
‘ml’ 0da123fcef Merge branch 'feature/ml' into develop
# Conflicts:
#	src/com/engine/organization/service/impl/ImportCommonServiceImpl.java
3 years ago
‘ml’ ec8be58a45 职等职级导入接口 3 years ago
Chengliang eeefde07ed 接口 3 years ago
dxfeng fa1434a64a 卡片分组权限 3 years ago
dxfeng dcf8418edb 代码还原 3 years ago
dxfeng 0e41f08327 组织架构图搜索下拉框、集团负责人BUG修复 3 years ago
‘ml’ ddafc854b6 修复组织机构图虚拟组织不显示 3 years ago
dxfeng 466ba43b31 人员卡片类别展示权限控制 3 years ago
dxfeng a6952f41b0 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 3 years ago
dxfeng b0021dae20 字段允许个人修改 3 years ago
liang.cheng c2a1908c10 Merge pull request 'bug修复' (#44) from feature/cl into develop
Reviewed-on: #44
3 years ago
Chengliang 99f849f350 bug修复 3 years ago
dxfeng a3a0ce8046 岗位按钮、人员字段权限 3 years ago
dxfeng 3813c8b54a Merge pull request '岗位按钮、组织架构图 BUG修复' (#43) from feature/dxf into develop
Reviewed-on: #43
3 years ago
dxfeng 9a163f1742 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 3 years ago
dxfeng c03a7c599a 岗位按钮、组织架构图 BUG修复 3 years ago
Chengliang dc347c755d 人员卡片菜单权限接口 3 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
dxfeng 47aafefa5a 分权BUG修复 3 years ago
‘ml’ 5e981c8163 Merge remote-tracking branch 'origin/develop' into feature/ml 3 years ago
‘ml’ 7d88bb9d5b 虚拟组织(新增修改删除接口) 3 years ago
Chengliang afcbbcefb1 人员卡片权限接口 3 years ago
dxfeng f6779ec20a Merge pull request '组织架构图分权功能' (#34) from feature/dxf into develop
Reviewed-on: #34
3 years ago
dxfeng be90013ca0 组织架构图分权功能 3 years ago
liang.cheng ac5eb30534 Merge pull request '人员卡片权限' (#33) from feature/cl into develop
Reviewed-on: #33
3 years ago
Chengliang 4e4cf54f8a 人员卡片权限 3 years ago
dxfeng 895528617b 分部、部门、岗位、人员 分权功能开发 3 years ago
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
3 years ago
dxfeng 0b3cd0641b 分权开发 3 years ago
Chengliang 1e08772a9d 分权开关设置 3 years ago
liang.cheng 19cccb9345 Merge pull request 'feature/detach' (#29) from feature/detach into develop
Reviewed-on: #29
3 years ago
dxfeng 3989161281 组织架构图相关BUG修复 3 years ago
Chengliang ef392f4d0a 模块管理分权 3 years ago
Chengliang 96cefec891 模块管理分权 3 years ago
Chengliang f6ea4425cf 模块管理分权 3 years ago
Chengliang 4c74b583bf 模块管理分权 3 years ago
Chengliang 2b975e6636 模块管理分权中心接口 3 years ago
dxfeng 92b246b5d5 组织架构图相关BUG修复 3 years ago
dxfeng 679c77f732 组织架构图相关BUG修复 3 years ago
dxfeng 7258ee742d 编制模板优化 3 years ago
dxfeng b2fc9d3e0c 人员编号、岗位部门、自定义下拉框BUG修复 3 years ago
dxfeng eeb21315c7 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 3 years ago
dxfeng a36648ea39 花名册树BUG 3 years ago
‘ml’ f2c5d1227b 分部、部门、岗位禁用、合并修复1025 3 years ago
dxfeng 594173175c 更新人员Map表信息 3 years ago
dxfeng b446dbdb53 人员导入、花名册左侧树BUG修复 3 years ago
dxfeng dca18ea5b1 编制导入模板、人员卡片、组织架构图Oracle 3 years ago
dxfeng 3b4c59ae8c 人员相关BUG修复 3 years ago
dxfeng 2515121d83 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 3 years ago
dxfeng 11a4a85ff1 人员关联调整 3 years ago
‘ml’ 887a1eafe3 Merge remote-tracking branch 'origin/develop' into feature/ml 3 years ago
dxfeng 52c8b86adb 人员关联调整 3 years ago
‘ml’ 9a9b79cff0 Merge remote-tracking branch 'origin/develop' into feature/ml 3 years ago
‘ml’ a0660a7857 分部转移、部门转移、岗位合并修复1020 3 years ago
dxfeng b7e34c1d31 人员关联调整 3 years ago
‘ml’ adc92c8287 部门合并在岗数优化1019 3 years ago
‘ml’ 5005243758 部门合并在岗数优化 3 years ago
dxfeng 414aefe41c 人事卡片BUG修复 3 years ago
dxfeng 63b6b88a96 人员管理BUG修复 3 years ago
dxfeng 396a4570d0 BUG修复 3 years ago
dxfeng f36756e1fd 分部、岗位 禁用功能限制 3 years ago
dxfeng 4a85fc46aa 部门转移BUG修复 3 years ago
dxfeng 1d7389c872 人员卡片 3 years ago
dxfeng f9c33da655 人员管理完善 3 years ago
dxfeng c538a6205f Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 3 years ago
dxfeng 3ac7c2b959 聚才林花名册 3 years ago
‘ml’ c78f2157f8 层级显示不一致优化 3 years ago
dxfeng 231addfda1 人事卡片接口开发 3 years ago
dxfeng acee0bad51 人员调整,在岗数关联优化 3 years ago
dxfeng c6fb0d129b 组织架构图编制、在岗,数据优化 3 years ago
Chengliang ca3a093357 bug 3 years ago
dxfeng 02836ce37d 岗位名称校验、编制展示优化、BUG修复 3 years ago
dxfeng 92d9a17d8c 组织架构图编制显示优化 3 years ago
dxfeng 106d7e8bb8 更新人员、编制 同步组织架构图 3 years ago
dxfeng 2632f6c857 BUG修复 3 years ago
dxfeng fe668c37e7 BUG修复 3 years ago
dxfeng c8eb2f3451 BUG修复 3 years ago
dxfeng b494a6a96e BUG修复 3 years ago
dxfeng 29295bb464 BUG修复 3 years ago
dxfeng 16fcd76468 编制导入 3 years ago
dxfeng 50e5c7312e 编制导入 3 years ago
dxfeng 8b7b75b57b Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf 3 years ago
dxfeng 35439a442f BUG 修复 3 years ago
Chengliang fbd608a52a 顶部按钮修改 3 years ago
dxfeng 76b9cd2a89 部门复制 3 years ago
dxfeng 34d44b6c91 部门复制 3 years ago
dxfeng 8e385537da BUG修复 3 years ago
dxfeng 5c66744468 部门合并、组织导入 3 years ago
dxfeng f6c41a3467 部门合并重写 3 years ago
Chengliang 6de1b0746f 修复富文本长度 3 years ago
dxfeng 0a87a2ad4d Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf 3 years ago
dxfeng 91a8ad0bd3 导入BUG 3 years ago
Chengliang c280c5f908 fixed 3 years ago
dxfeng 59f76c012c 触发器,分部、部门赋值,SQL脚本 3 years ago
dxfeng 79c5f94862 导入问题处理 3 years ago
dxfeng 120b4efdba 不同等级方案、编号可重复 3 years ago
dxfeng 6765fd8fc4 左侧树排序 3 years ago
dxfeng 900ded1aad 表结构更新 3 years ago
dxfeng 278d61c499 Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf 3 years ago
Chengliang 3e06077e2a fixed 3 years ago
dxfeng 6c04ffd384 编制管理 3 years ago
dxfeng 6415ee3eb7 编制方案 3 years ago
dxfeng d65551c0ee 复制BUG修复 3 years ago
dxfeng b1b2a9a88a 部门管理,更新为EC 3 years ago
dxfeng 4fa38f704c 分部管理,更新为EC 3 years ago
dxfeng f05cf6da8f BUG修复 3 years ago
Chengliang 0ffb0bac33 fix 3 years ago
Chengliang 819a053aa3 fixed 3 years ago
dxfeng 09d624b46b
!219 触发器、非标开关
Merge pull request !219 from dxfeng/feature/dxf
3 years ago
dxfeng b49a25742a 触发器、非标开关 3 years ago
Chengliang b5b90a6403 修复组织架构图跳转问题 3 years ago
dxfeng 1f7f299368 分部、部门、岗位触发器 3 years ago
dxfeng 56ed6aa197 BUG修复 3 years ago
dxfeng 5dc920e364 人员信息分类 3 years ago
dxfeng cfc78875c6 人员信息分类 3 years ago
dxfeng b6caffc74f 人员信息分类 删除接口 3 years ago
dxfeng 2744f85eff BUG修复 3 years ago
dxfeng 532a6d00ce 人员信息分类 3 years ago
dxfeng 6351109b79 人员信息分类 3 years ago
dxfeng f82e679837 Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf 3 years ago
dxfeng 8968e44e09 分部、部门、岗位同步EC重写 3 years ago
Chengliang 6bfc6eae27 人员信息管理 3 years ago
Chengliang ca7d34a5bd 人员信息模块 3 years ago
reset 776d60674b
!207 fixed
Merge pull request !207 from reset/feature/cl
3 years ago
Chengliang c8bf27880a fixed 3 years ago
Chengliang 8043012b41 人基础员信息 3 years ago
dxfeng 0d9cbe7ff5 BUG修复 3 years ago
dxfeng 07dabf46a0 BUG修复 3 years ago
dxfeng fb5eea214b BUG修复 3 years ago
dxfeng 564b30eed8 BUG修复 3 years ago
dxfeng 477a2f3bce 自定义字段BUG修复 3 years ago
dxfeng e135b02ed7
!201 BUG修复
Merge pull request !201 from dxfeng/feature/dxf
3 years ago
dxfeng ff8660a586 BUG修复 3 years ago
dxfeng 9c64467cc8 BUG修复 3 years ago
dxfeng b1ed914ebc BUG修复,权限控制 3 years ago
Chengliang 94ce6388e2 fixed 3 years ago
dxfeng ef6f21c636 BUG修复,权限控制 3 years ago
dxfeng 5cce107318 BUG修复,权限控制 3 years ago
dxfeng 3acec4730d BUG修复,权限控制 3 years ago
dxfeng e3207f2996 BUG修复 3 years ago
dxfeng ea64d13503 BUG修复 3 years ago