Mlin
|
32e8eb4890
|
分部、部门版本控制写入逻辑
|
2022-12-09 16:57:42 +08:00 |
|
Mlin
|
1bdc7e2fa4
|
Merge remote-tracking branch 'origin/develop' into feature/ml
|
2022-12-09 16:04:50 +08:00 |
|
Mlin
|
13ae136872
|
部门版本控制写入逻辑
|
2022-12-09 16:04:35 +08:00 |
 dxfeng
|
06c9912d21
|
BUG修复,岗位关联关系调整
|
2022-12-09 15:07:34 +08:00 |
|
dxfeng
|
3470ba04cd
|
岗位关联关系调整
|
2022-12-09 14:29:20 +08:00 |
|
Mlin
|
73dbaf75ac
|
分部版本控制写入逻辑
|
2022-12-09 08:50:23 +08:00 |
|
dxfeng
|
c1c812596d
|
BUG修复
|
2022-12-08 17:10:31 +08:00 |
|
dxfeng
|
f89ebdb965
|
分部、部门联调。BUG修复
|
2022-12-08 14:16:58 +08:00 |
 Chengliang
|
d345a5fe66
|
版本管理
|
2022-12-08 09:56:25 +08:00 |
|
dxfeng
|
64af65cad3
|
部门导入新增、更新
|
2022-12-06 17:11:48 +08:00 |
|
dxfeng
|
54c3676c07
|
分部BUG修复，导入接口逻辑重写
|
2022-12-06 14:47:50 +08:00 |
|
dxfeng
|
85ec966813
|
人员卡片查看页面逻辑重写
|
2022-12-05 17:57:33 +08:00 |
|
dxfeng
|
bd33075e14
|
部门管理功能逻辑调整
|
2022-11-30 16:06:40 +08:00 |
|
dxfeng
|
40a6540a1d
|
部门管理功能逻辑调整
|
2022-11-30 15:55:27 +08:00 |
|
dxfeng
|
238d8e6f75
|
部门接口逻辑调整
|
2022-11-29 17:00:31 +08:00 |
|
dxfeng
|
9a2eabc8bd
|
部门切换数据源、实体类更新
|
2022-11-29 09:54:18 +08:00 |
|
dxfeng
|
aa3d0742ff
|
分部接口整理、代码优化
|
2022-11-28 11:15:54 +08:00 |
|
dxfeng
|
416471a283
|
分部列表、新增、删除、转移功能重写
|
2022-11-24 17:56:32 +08:00 |
|
dxfeng
|
f7758e5298
|
人员导入提示信息优化
|
2022-11-23 09:34:06 +08:00 |
|
dxfeng
|
ae2e5bb5a4
|
人员Mapper整合
|
2022-11-21 10:58:12 +08:00 |
|
dxfeng
|
7d1fc84fad
|
组织架构树排序、人员卡片BUG修复
|
2022-11-18 16:28:02 +08:00 |
|
dxfeng
|
a273008715
|
导入BUG，提示信息优化
|
2022-11-17 11:36:52 +08:00 |
|
dxfeng
|
81943df058
|
编制、分部树排序
|
2022-11-16 17:39:58 +08:00 |
|
dxfeng
|
9b20c6838a
|
人事卡片按钮权限BUG
|
2022-11-16 16:09:32 +08:00 |
|
dxfeng
|
17f4789e33
|
BUG修复
|
2022-11-16 14:59:22 +08:00 |
|
dxfeng
|
05364f9265
|
BUG修复
|
2022-11-16 13:39:56 +08:00 |
|
dxfeng
|
10bb8159aa
|
明细表BUG修复
|
2022-11-14 19:13:35 +08:00 |
|
dxfeng
|
7b5a4905dc
|
BUG修复、卡片按钮排序
|
2022-11-14 11:19:08 +08:00 |
|
dxfeng
|
4a0ddd8adc
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2022-11-11 17:24:55 +08:00 |
|
dxfeng
|
cd11f06b7f
|
卡片按钮新增、删除
|
2022-11-11 17:24:22 +08:00 |
‘ml’
|
091f202eac
|
职务导入
|
2022-11-11 16:50:35 +08:00 |
|
dxfeng
|
854a40b7cd
|
人员卡片按钮自定义
|
2022-11-11 14:11:34 +08:00 |
|
dxfeng
|
d16f13405c
|
人员卡片按钮自定义
|
2022-11-11 13:59:45 +08:00 |
|
dxfeng
|
57d788d807
|
人员卡片按钮权限
|
2022-11-11 09:09:53 +08:00 |
|
‘ml’
|
0da123fcef
|
Merge branch 'feature/ml' into develop
# Conflicts:
# src/com/engine/organization/service/impl/ImportCommonServiceImpl.java
|
2022-11-10 10:58:00 +08:00 |
|
‘ml’
|
ec8be58a45
|
职等职级导入接口
|
2022-11-10 10:55:56 +08:00 |
|
Chengliang
|
eeefde07ed
|
接口
|
2022-11-10 10:29:03 +08:00 |
|
dxfeng
|
466ba43b31
|
人员卡片类别展示权限控制
|
2022-11-09 16:58:09 +08:00 |
|
dxfeng
|
a6952f41b0
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2022-11-09 11:13:55 +08:00 |
|
dxfeng
|
b0021dae20
|
字段允许个人修改
|
2022-11-09 11:07:55 +08:00 |
|
Chengliang
|
99f849f350
|
bug修复
|
2022-11-09 09:45:19 +08:00 |
|
dxfeng
|
a3a0ce8046
|
岗位按钮、人员字段权限
|
2022-11-08 17:26:59 +08:00 |
|
Chengliang
|
dc347c755d
|
人员卡片菜单权限接口
|
2022-11-08 09:23:53 +08:00 |
|
dxfeng
|
31645b34fe
|
分权BUG修复
|
2022-11-03 16:45:02 +08:00 |
|
dxfeng
|
47aafefa5a
|
分权BUG修复
|
2022-11-03 11:06:36 +08:00 |
|
dxfeng
|
18767b722c
|
聚才林岗位分权
|
2022-11-02 14:30:22 +08:00 |
|
liang.cheng
|
121927dba8
|
Merge pull request '人员卡片类型权限' (#35) from feature/cl into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/35
|
2022-11-02 11:31:54 +08:00 |
|
Chengliang
|
b636dc2b82
|
人员卡片类型权限
|
2022-11-02 11:29:40 +08:00 |
|
dxfeng
|
895528617b
|
分部、部门、岗位、人员 分权功能开发
|
2022-11-01 10:05:43 +08:00 |
|
dxfeng
|
0b3cd0641b
|
分权开发
|
2022-10-28 17:43:46 +08:00 |
|
dxfeng
|
40f1f097e6
|
代码合并
|
2022-10-28 10:35:33 +08:00 |
|
Chengliang
|
ef392f4d0a
|
模块管理分权
|
2022-10-27 15:00:12 +08:00 |
|
‘ml’
|
939e6c7607
|
分部转移、部门转移、岗位合并修复1021
|
2022-10-27 14:59:57 +08:00 |
|
Chengliang
|
96cefec891
|
模块管理分权
|
2022-10-27 14:58:44 +08:00 |
|
Chengliang
|
f6ea4425cf
|
模块管理分权
|
2022-10-27 14:58:44 +08:00 |
|
Chengliang
|
4c74b583bf
|
模块管理分权
|
2022-10-27 14:58:44 +08:00 |
|
dxfeng
|
92b246b5d5
|
组织架构图相关BUG修复
|
2022-10-27 14:39:35 +08:00 |
|
dxfeng
|
679c77f732
|
组织架构图相关BUG修复
|
2022-10-26 20:12:14 +08:00 |
|
dxfeng
|
b2fc9d3e0c
|
人员编号、岗位部门、自定义下拉框BUG修复
|
2022-10-25 15:43:02 +08:00 |
|
‘ml’
|
f2c5d1227b
|
分部、部门、岗位禁用、合并修复1025
|
2022-10-25 10:47:08 +08:00 |
|
‘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
|
2022-10-24 16:01:51 +08:00 |
|
‘ml’
|
65ccecce56
|
分部、部门、岗位禁用修复1024
|
2022-10-24 16:00:00 +08:00 |
|
dxfeng
|
dca18ea5b1
|
编制导入模板、人员卡片、组织架构图Oracle
|
2022-10-24 15:57:08 +08:00 |
|
dxfeng
|
2515121d83
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2022-10-21 15:58:13 +08:00 |
|
dxfeng
|
11a4a85ff1
|
人员关联调整
|
2022-10-21 15:57:55 +08:00 |
|
‘ml’
|
05fe14b5e1
|
分部转移、部门转移、岗位合并修复1021
|
2022-10-21 15:53:15 +08:00 |
|
‘ml’
|
9a9b79cff0
|
Merge remote-tracking branch 'origin/develop' into feature/ml
|
2022-10-20 17:31:23 +08:00 |
|
‘ml’
|
a0660a7857
|
分部转移、部门转移、岗位合并修复1020
|
2022-10-20 17:30:34 +08:00 |
|
dxfeng
|
b7e34c1d31
|
人员关联调整
|
2022-10-20 09:07:32 +08:00 |
|
dxfeng
|
eb007f5b23
|
人事卡片BUG修复
|
2022-10-18 16:35:08 +08:00 |
|
‘ml’
|
5005243758
|
部门合并在岗数优化
|
2022-10-18 12:17:11 +08:00 |
|
dxfeng
|
63b6b88a96
|
人员管理BUG修复
|
2022-10-17 17:16:26 +08:00 |
|
dxfeng
|
396a4570d0
|
BUG修复
|
2022-10-17 11:35:46 +08:00 |
|
dxfeng
|
f36756e1fd
|
分部、岗位 禁用功能限制
|
2022-10-14 14:56:35 +08:00 |
|
dxfeng
|
f9c33da655
|
人员管理完善
|
2022-10-14 09:13:28 +08:00 |
|
dxfeng
|
46068ab008
|
编制Action 添加提示信息，BUG修复
|
2022-10-13 13:59:41 +08:00 |
|
dxfeng
|
f26159506a
|
岗位浏览按钮、编制action BUG修复
|
2022-10-12 15:23:24 +08:00 |
|
dxfeng
|
9df3349715
|
兼容EC岗位名称重复
|
2022-10-09 15:36:53 +08:00 |
|
dxfeng
|
231addfda1
|
人事卡片接口开发
|
2022-10-09 11:42:26 +08:00 |
|
dxfeng
|
284f778963
|
人员调整,在岗数关联优化
|
2022-09-30 15:19:22 +08:00 |
|
dxfeng
|
acee0bad51
|
人员调整,在岗数关联优化
|
2022-09-30 11:05:42 +08:00 |
|
dxfeng
|
c6fb0d129b
|
组织架构图编制、在岗,数据优化
|
2022-09-29 15:57:00 +08:00 |
|
dxfeng
|
02836ce37d
|
岗位名称校验、编制展示优化、BUG修复
|
2022-09-23 15:53:37 +08:00 |
|
dxfeng
|
92d9a17d8c
|
组织架构图编制显示优化
|
2022-09-23 09:19:42 +08:00 |
|
dxfeng
|
106d7e8bb8
|
更新人员、编制 同步组织架构图
|
2022-09-21 16:23:09 +08:00 |
|
dxfeng
|
a847a4efef
|
兼容Oracle,达梦
|
2022-09-21 10:43:41 +08:00 |
|
dxfeng
|
8a9370ee9e
|
BUG修复
|
2022-09-20 18:46:05 +08:00 |
|
dxfeng
|
2632f6c857
|
BUG修复
|
2022-09-20 10:25:13 +08:00 |
|
dxfeng
|
fe668c37e7
|
BUG修复
|
2022-09-19 13:27:50 +08:00 |
|
dxfeng
|
35439a442f
|
BUG 修复
|
2022-09-15 10:41:04 +08:00 |
|
dxfeng
|
5c66744468
|
部门合并、组织导入
|
2022-09-08 17:54:46 +08:00 |
|
dxfeng
|
f6c41a3467
|
部门合并重写
|
2022-09-08 15:36:47 +08:00 |
|
dxfeng
|
34af4f95c9
|
Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf
|
2022-09-06 17:23:57 +08:00 |
|
dxfeng
|
79c5f94862
|
导入问题处理
|
2022-09-06 17:23:44 +08:00 |
|
dxfeng
|
120b4efdba
|
不同等级方案、编号可重复
|
2022-09-06 15:38:16 +08:00 |
|
Chengliang
|
ba0b31f086
|
fixed
|
2022-09-06 14:26:09 +08:00 |
|
dxfeng
|
6c04ffd384
|
编制管理
|
2022-09-06 10:33:46 +08:00 |
|
dxfeng
|
6415ee3eb7
|
编制方案
|
2022-09-06 09:45:56 +08:00 |
|
dxfeng
|
b1b2a9a88a
|
部门管理，更新为EC
|
2022-09-05 17:25:11 +08:00 |
|
dxfeng
|
4fa38f704c
|
分部管理，更新为EC
|
2022-09-05 15:58:46 +08:00 |