Mlin
|
1bdc7e2fa4
|
Merge remote-tracking branch 'origin/develop' into feature/ml
|
2 years ago |
 dxfeng
|
3470ba04cd
|
岗位关联关系调整
|
2 years ago |
|
Mlin
|
73dbaf75ac
|
分部版本控制写入逻辑
|
2 years ago |
 Chengliang
|
d345a5fe66
|
版本管理
|
2 years ago |
|
dxfeng
|
fb17f43323
|
部门管理功能逻辑调整
|
2 years ago |
|
dxfeng
|
bd33075e14
|
部门管理功能逻辑调整
|
2 years ago |
|
dxfeng
|
238d8e6f75
|
部门接口逻辑调整
|
2 years ago |
|
dxfeng
|
9a2eabc8bd
|
部门切换数据源、实体类更新
|
2 years ago |
|
dxfeng
|
aa3d0742ff
|
分部接口整理、代码优化
|
2 years ago |
|
dxfeng
|
416471a283
|
分部列表、新增、删除、转移功能重写
|
2 years ago |
|
dxfeng
|
16794bf98c
|
人员卡片按钮保存
|
2 years ago |
|
dxfeng
|
d16f13405c
|
人员卡片按钮自定义
|
2 years ago |
|
dxfeng
|
57d788d807
|
人员卡片按钮权限
|
2 years ago |
|
Chengliang
|
afcbbcefb1
|
人员卡片权限接口
|
3 years ago |
|
Chengliang
|
4e4cf54f8a
|
人员卡片权限
|
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 |
‘ml’
|
1be79b9698
|
分部、部门、岗位禁用修复1024
|
3 years ago |
|
Chengliang
|
96cefec891
|
模块管理分权
|
3 years ago |
|
Chengliang
|
f6ea4425cf
|
模块管理分权
|
3 years ago |
|
Chengliang
|
4c74b583bf
|
模块管理分权
|
3 years ago |
|
Chengliang
|
2b975e6636
|
模块管理分权中心接口
|
3 years ago |
|
dxfeng
|
679c77f732
|
组织架构图相关BUG修复
|
3 years ago |
|
‘ml’
|
f2c5d1227b
|
分部、部门、岗位禁用、合并修复1025
|
3 years ago |
|
‘ml’
|
65ccecce56
|
分部、部门、岗位禁用修复1024
|
3 years ago |
|
dxfeng
|
b7e34c1d31
|
人员关联调整
|
3 years ago |
|
dxfeng
|
63b6b88a96
|
人员管理BUG修复
|
3 years ago |
|
dxfeng
|
231addfda1
|
人事卡片接口开发
|
3 years ago |
|
dxfeng
|
b494a6a96e
|
BUG修复
|
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
|
0a87a2ad4d
|
Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf
|
3 years ago |
|
Chengliang
|
c280c5f908
|
fixed
|
3 years ago |
|
dxfeng
|
59f76c012c
|
触发器，分部、部门赋值，SQL脚本
|
3 years ago |
|
Chengliang
|
8553e37c22
|
fixed
|
3 years ago |
|
Chengliang
|
819a053aa3
|
fixed
|
3 years ago |
|
dxfeng
|
b49a25742a
|
触发器、非标开关
|
3 years ago |
|
dxfeng
|
1f7f299368
|
分部、部门、岗位触发器
|
3 years ago |
|
dxfeng
|
532a6d00ce
|
人员信息分类
|
3 years ago |
|
dxfeng
|
6351109b79
|
人员信息分类
|
3 years ago |
|
Chengliang
|
ca7d34a5bd
|
人员信息模块
|
3 years ago |
|
Chengliang
|
8043012b41
|
人基础员信息
|
3 years ago |
|
dxfeng
|
5cce107318
|
BUG修复，权限控制
|
3 years ago |
|
dxfeng
|
3acec4730d
|
BUG修复，权限控制
|
3 years ago |
|
dxfeng
|
f27612db94
|
Oracle BUG修复
|
3 years ago |
|
dxfeng
|
6576335c6c
|
BUG修复
|
3 years ago |
|
dxfeng
|
08a9ab7b0d
|
BUG修复
|
3 years ago |
|
dxfeng
|
0e3fc1a238
|
同步CusFieldData数据接口
|
3 years ago |
|
dxfeng
|
ceb3484d6d
|
编制方案需求完善
|
3 years ago |
|
dxfeng
|
0a47b3548d
|
人员导入
|
3 years ago |
|
dxfeng
|
fc8aaf7729
|
部门导入、日志记录
|
3 years ago |
|
dxfeng
|
c23127acc2
|
分部导入、日志记录
|
3 years ago |
|
dxfeng
|
b1365da225
|
分部导入
|
3 years ago |
|
dxfeng
|
9d304b0303
|
分部导入
|
3 years ago |
MustangDeng
|
cc318fa73c
|
Merge branch 'feature/djp' into develop
|
3 years ago |
|
MustangDeng
|
0a1e6c6e7d
|
feature: 组织架构异步数据v1.0
|
3 years ago |
|
Chengliang
|
a1ed3e45c9
|
需求优化2
|
3 years ago |
|
dxfeng
|
81fcd96af6
|
人员拓展卡片
|
3 years ago |
|
670124965@qq.com
|
58f3aedf9d
|
Merge branch 'feature/djp' into develop
|
3 years ago |
|
dxfeng
|
7103eb0c73
|
记录操作日志
|
3 years ago |
|
dxfeng
|
40a7c066a2
|
记录操作日志
|
3 years ago |
|
MustangDeng
|
b589056585
|
组织结构图接口
|
3 years ago |
|
dxfeng
|
2702b175cd
|
记录操作日志
|
3 years ago |
|
dxfeng
|
bef63439b2
|
记录操作日志
|
3 years ago |
|
dxfeng
|
278194a4a3
|
记录操作日志,岗位优化
|
3 years ago |
|
dxfeng
|
f5d95fabb2
|
记录操作日志
|
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 |
|
reset
|
be94ae88e7
|
!129 1
Merge pull request !129 from reset/feature/cl
|
3 years ago |
|
Chengliang
|
300ccd6d77
|
“导出修改”
|
3 years ago |
|
dxfeng
|
9b54954ef8
|
人员导入
|
3 years ago |
|
dxfeng
|
5ceb8ae068
|
Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf
|
3 years ago |
|
Chengliang
|
0ad6157c26
|
人员导出功能
|
3 years ago |
|
dxfeng
|
4eef6f62de
|
人员导入
|
3 years ago |
|
dxfeng
|
d0ea50cec5
|
部门、岗位 合并
|
3 years ago |
|
dxfeng
|
db4e066294
|
复制分部 表结构更新
|
3 years ago |
|
dxfeng
|
2ea923f9c9
|
转移分部
|
3 years ago |
|
dxfeng
|
6c40245b02
|
组织人事测试、优化
|
3 years ago |
|
dxfeng
|
f72db1b5f9
|
组织人事测试、优化
|
3 years ago |
|
dxfeng
|
bdc813000e
|
人员管理查询条件 按钮接口，
是否禁用名称更改
|
3 years ago |
|
dxfeng
|
5b6cf8fe72
|
人员管理新增、编辑相关接口
|
3 years ago |
|
dxfeng
|
187be45bdf
|
人员管理：左侧树、列表接口
|
3 years ago |
|
dxfeng
|
2af1fb6336
|
移动到组
|
3 years ago |
|
dxfeng
|
6df1accb98
|
BUG 修复
|
3 years ago |
|
dxfeng
|
445507d10d
|
表结构更新
|
3 years ago |
|
dxfeng
|
c8604a8e40
|
数据返回格式修改
|
3 years ago |
|
dxfeng
|
9aebfbcecc
|
字段删除 移动分组
|
3 years ago |
|
dxfeng
|
eb9c77b2d0
|
Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf
Conflicts:
src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java
src/com/engine/organization/web/FieldDefinedController.java
src/com/engine/organization/wrapper/FieldDefinedWrapper.java
|
3 years ago |
|
Chengliang
|
6d4448ec51
|
子信息维护
|
3 years ago |
|
dxfeng
|
08ca2e0c5d
|
自定义字段列表
|
3 years ago |
|
dxfeng
|
52c964f199
|
添加自定义字段接口
|
3 years ago |
|
dxfeng
|
57b29a2312
|
BUG修复
|
3 years ago |
|
dxfeng
|
3f151d55e6
|
Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf
Conflicts:
src/com/engine/organization/entity/extend/bo/ExtendGroupBO.java
src/com/engine/organization/service/FieldDefinedService.java
src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java
src/com/engine/organization/web/FieldDefinedController.java
src/com/engine/organization/wrapper/FieldDefinedWrapper.java
|
3 years ago |
|
dxfeng
|
7c02e9bc61
|
分组删除 新增自定义字段
|
3 years ago |
|
Chengliang
|
f4f7038611
|
新增编辑类型
|
3 years ago |
