Commit Graph

383 Commits (38a1fca5855e6092c61bacbf1d3153f9248dc6f0)

Author SHA1 Message Date
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
dxfeng e83e3b90fc Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf 3 years ago
dxfeng 40a7c066a2 记录操作日志 3 years ago
Chengliang 0bdcc18c56 日期组合改造 3 years ago
MustangDeng b589056585 组织结构图接口 3 years ago
dxfeng 2702b175cd 记录操作日志 3 years ago
dxfeng cca52d7080 记录操作日志 3 years ago
dxfeng c139cd408a 记录操作日志 3 years ago
dxfeng 4f52218e89 Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf 3 years ago
reset 9b1d7a26d3
!141 需求优化
Merge pull request !141 from reset/feature/cl
3 years ago
dxfeng bef63439b2 记录操作日志 3 years ago
Chengliang 6c304e8a81 需求优化 3 years ago
dxfeng 278194a4a3 记录操作日志,岗位优化 3 years ago
dxfeng f5d95fabb2 记录操作日志 3 years ago
dxfeng 618e30e6ef 操作日志 3 years ago
dxfeng 37142c3a3e Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf
 Conflicts:
	src/com/engine/organization/service/impl/DemoServiceImpl.java
3 years ago
dxfeng 033e90aa34 操作日志 3 years ago
Chengliang 46aeddea39 需求调整 3 years ago
Chengliang eec9446dcd 去除weaverboot引用 3 years ago
dxfeng 6b96ea7ca0 人员列表 搜索条件 3 years ago
dxfeng 03f59d55d0 人员列表查询系统表 异常信息处理 3 years ago
dxfeng 5291c3b855 分部列表BUG修复 3 years ago
dxfeng 1a1646e818 人员导入 3 years ago
dxfeng fca0bb4dad 人员导入 3 years ago
dxfeng d508a4d9d0 人员导入,日志表结构 3 years ago
dxfeng 66f5438d17 人员导入 3 years ago
dxfeng 1e7caac8ff 人员导入 3 years ago
dxfeng 655933236c 组织导入 3 years ago
dxfeng 26ef362eb4 组织导入 3 years ago
dxfeng 3f6b2c340b 人员导入 3 years ago
dxfeng c8b93b70b4 Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf 3 years ago
dxfeng 82aa6c5a03 人员导入 3 years ago
reset be94ae88e7
!129 1
Merge pull request !129 from reset/feature/cl
3 years ago
Chengliang 5445e6bfac 导出和批量导出完成 3 years ago