Commit Graph

716 Commits (4076a755f18e9ec2d4a6d80ce9a06c6289d866f1)

Author SHA1 Message Date
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 85e39fd564 分权BUG修复 3 years ago
dxfeng 373eebe5d8 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 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
liang.cheng 41370fe770 Merge pull request '人员卡片权限接口' (#37) from feature/cl into develop
Reviewed-on: #37
3 years ago
Chengliang afcbbcefb1 人员卡片权限接口 3 years ago
dxfeng 18767b722c 聚才林岗位分权 3 years ago
liang.cheng 121927dba8 Merge pull request '人员卡片类型权限' (#35) from feature/cl into develop
Reviewed-on: #35
3 years ago
Chengliang b636dc2b82 人员卡片类型权限 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
dxfeng 40f1f097e6 代码合并 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 47c64b6797 模块管理分权 3 years ago
Chengliang ef392f4d0a 模块管理分权 3 years ago
‘ml’ 1be79b9698 分部、部门、岗位禁用修复1024 3 years ago
‘ml’ 939e6c7607 分部转移、部门转移、岗位合并修复1021 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
‘ml’ e198209705 Merge remote-tracking branch 'origin/develop' into feature/ml 3 years ago
dxfeng 594173175c 更新人员Map表信息 3 years ago
dxfeng b446dbdb53 人员导入、花名册左侧树BUG修复 3 years ago
‘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
3 years ago
‘ml’ 65ccecce56 分部、部门、岗位禁用修复1024 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’ 05fe14b5e1 分部转移、部门转移、岗位合并修复1021 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
dxfeng a5687b3995 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 3 years ago
‘ml’ adc92c8287 部门合并在岗数优化1019 3 years ago
dxfeng eb007f5b23 人事卡片BUG修复 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 cd4d2c77bf 人员卡片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 46068ab008 编制Action 添加提示信息,BUG修复 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
dxfeng f26159506a 岗位浏览按钮、编制action BUG修复 3 years ago
‘ml’ c78f2157f8 层级显示不一致优化 3 years ago
Chengliang eb5578fd64 编制删除 3 years ago
dxfeng 9df3349715 兼容EC岗位名称重复 3 years ago
dxfeng 231addfda1 人事卡片接口开发 3 years ago
dxfeng 284f778963 人员调整,在岗数关联优化 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 7eb7a93397 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 3 years ago
dxfeng a847a4efef 兼容Oracle,达梦 3 years ago
dxfeng 8a9370ee9e BUG修复 3 years ago
Chengliang 61aabb4ca1 测试 3 years ago
dxfeng 38725f97b0 BUG修复 3 years ago
dxfeng 2632f6c857 BUG修复 3 years ago
dxfeng b214ec8509 BUG修复 3 years ago
dxfeng fe668c37e7 BUG修复 3 years ago
dxfeng c49abcf77f BUG修复 3 years ago
dxfeng c8eb2f3451 BUG修复 3 years ago
dxfeng 1b4d7203b8 BUG修复 3 years ago
dxfeng b494a6a96e BUG修复 3 years ago
dxfeng 29295bb464 BUG修复 3 years ago
dxfeng 4b3bb0d5f3 编制导入 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 34af4f95c9 Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf 3 years ago
dxfeng 79c5f94862 导入问题处理 3 years ago
dxfeng 120b4efdba 不同等级方案、编号可重复 3 years ago
Chengliang 8553e37c22 fixed 3 years ago
Chengliang 1c900eafc9 Merge remote-tracking branch 'origin/develop' into feature/cl
# Conflicts:
#	src/com/engine/organization/service/impl/CompServiceImpl.java
3 years ago
dxfeng 6765fd8fc4 左侧树排序 3 years ago
Chengliang ba0b31f086 fixed 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
reset 38a1fca585
!224 bug修复
Merge pull request !224 from reset/feature/cl
3 years ago
Chengliang 0ffb0bac33 fix 3 years ago
dxfeng 337f8e51ed Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf 3 years ago
dxfeng 989526bc26 使用状态BUG修复 3 years ago
Chengliang 819a053aa3 fixed 3 years ago
Chengliang f5fcbdaff8 列表宽度顺序调整 3 years ago
reset 385ff8331e
!220 fixed
Merge pull request !220 from reset/feature/cl
3 years ago
Chengliang 3eb29f823f fixed 3 years ago
dxfeng 09d624b46b
!219 触发器、非标开关
Merge pull request !219 from dxfeng/feature/dxf
3 years ago
dxfeng 489ad2fdd0 Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf 3 years ago
dxfeng b49a25742a 触发器、非标开关 3 years ago
Chengliang 80d3202c70 fixed 3 years ago
Chengliang b5b90a6403 修复组织架构图跳转问题 3 years ago
dxfeng 1f7f299368 分部、部门、岗位触发器 3 years ago
dxfeng 56ed6aa197 BUG修复 3 years ago
dxfeng 21dc07dd40 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
dxfeng e0b09bde52 BUG修复 3 years ago
dxfeng cdafa11668 兼容Oracle 3 years ago
dxfeng e4d9d80fee 兼容Oracle 3 years ago
dxfeng 1318fc1aba BUG修复 3 years ago
dxfeng 05c24b5e98 Oracle BUG修复 3 years ago
dxfeng 3e6a4acf8c Oracle BUG修复 3 years ago
dxfeng f27612db94 Oracle BUG修复 3 years ago
dxfeng abc470935e
!188 BUG修复
Merge pull request !188 from dxfeng/feature/dxf
3 years ago
dxfeng 6576335c6c BUG修复 3 years ago
reset ad5cfbb527
!187 fix
Merge pull request !187 from reset/feature/cl
3 years ago
Chengliang fef2717962 组织架构图查询条件 3 years ago
dxfeng 08a9ab7b0d BUG修复 3 years ago
dxfeng 48861cdace BUG修复 3 years ago
dxfeng 68ae1c03fd BUG修复 3 years ago
dxfeng 36ce009929 非标脚本完善,BUG修复 3 years ago
dxfeng 5779beacff 非标脚本完善,BUG修复 3 years ago
dxfeng 9992e807b4 Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf 3 years ago
reset 9bad53c5aa
!177 非标开关
Merge pull request !177 from reset/feature/cl
3 years ago
dxfeng 0e3fc1a238 同步CusFieldData数据接口 3 years ago
Chengliang b5fd59db2b fix 3 years ago
Chengliang 665a4a0394 非标开关 3 years ago
dxfeng ceb3484d6d 编制方案需求完善 3 years ago
dxfeng 1c9b1abe69 编制方案需求完善 3 years ago
dxfeng 7b88ba5a78 编制方案需求完善 3 years ago
dxfeng 6c91c3d41d BUG修复 3 years ago
dxfeng 46ab51ee18 人员导入、CusFieldData触发器调整 3 years ago
Chengliang 4ac0c27950 fixed 3 years ago
dxfeng ceba6b5d62 BUG修复 3 years ago
dxfeng 0a47b3548d 人员导入 3 years ago
dxfeng d5447c8e59 岗位导入 3 years ago
dxfeng bc151f7648 部门导入 3 years ago
dxfeng fc8aaf7729 部门导入、日志记录 3 years ago
dxfeng c23127acc2 分部导入、日志记录 3 years ago
dxfeng b1365da225 分部导入 3 years ago
dxfeng 79d79575da 分部导入 3 years ago
dxfeng 3356a7388e 分部导入 3 years ago
dxfeng 9d304b0303 分部导入 3 years ago
dxfeng 5ccb12569a
!163 BUG 修复
Merge pull request !163 from dxfeng/feature/dxf
3 years ago
dxfeng 56a697d4e4 BUG 修复 3 years ago
MustangDeng 3e92e25520 Merge branch 'feature/djp' into develop 3 years ago
MustangDeng d950e1ae40 fix: fleader问题 3 years ago
MustangDeng cc318fa73c Merge branch 'feature/djp' into develop 3 years ago
MustangDeng 10a577d0c4 Merge remote-tracking branch 'origin/develop' into develop 3 years ago
MustangDeng ac490e1b8f fix: whereSql合并 3 years ago
MustangDeng 06ccafb464 fix: fnumber问题 3 years ago
MustangDeng 0a1e6c6e7d feature: 组织架构异步数据v1.0 3 years ago
dxfeng 3ed9ec2f99 岗位浏览按钮优化 3 years ago
dxfeng 8869a18977 Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf 3 years ago
dxfeng fa663a1eaa 岗位浏览按钮优化 3 years ago
reset 71109c35ae Merge branch 'develop' of gitee.com:jmlcl/weaver-hrm-organization into feature/cl 3 years ago
Chengliang 09490fe867 浏览按钮 3 years ago
Chengliang cb274d6a6c 需求优化2 3 years ago
dxfeng 1db3f999f9 分部更新EC 3 years ago
dxfeng 92b2f54ddd 人员拓展卡片、分部更新EC 3 years ago
dxfeng 58e9f0ebb8 初始化SQL提交 3 years ago
dxfeng 3c74268126 岗位浏览按钮 3 years ago
dxfeng b8adf9ab7b 岗位模块操作同步EC 3 years ago
dxfeng 15c9ef7e61 分部、部门 添加UUID列;部门表结构更新 3 years ago
dxfeng d72c68dec0 Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf 3 years ago
dxfeng e217ecbe16 分部更新EC 3 years ago
reset 7f5568809c
!154 需求优化2
Merge pull request !154 from reset/feature/cl
3 years ago
Chengliang a1ed3e45c9 需求优化2 3 years ago
dxfeng b52bb93dfa 人员拓展卡片、分部更新EC 3 years ago
dxfeng 81fcd96af6 人员拓展卡片 3 years ago
dxfeng 7ecd58d27b 删除webService 3 years ago
dxfeng 15a819a272 表结构更新 3 years ago
MustangDen f4f222ba91 Merge branch 'feature/djp' into develop 3 years ago
MustangDen 7df8602e97 fix 组织架构sql问题 3 years ago
dxfeng 2bbf5367c6 Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf 3 years ago
dxfeng d760367a95 记录操作日志 3 years ago
670124965@qq.com 58f3aedf9d Merge branch 'feature/djp' into develop 3 years ago
dxfeng 2175d7ca6a 记录操作日志 3 years ago
dxfeng 7103eb0c73 记录操作日志 3 years ago