161 Commits

Author SHA1 Message Date
杜建超
b2406efb21 fix 2020-10-30 14:11:22 +08:00
杜建超
b1ef88c49e Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-10-30 10:50:00 +08:00
杜建超
d96c2d2cdb fix 2020-10-30 10:49:53 +08:00
wulin
e5b21bde35 保存组接口增加对组管理员表lz_staff_role数据的插入 2020-10-30 09:54:58 +08:00
杜建超
d8a4bf513a fix 2020-10-30 09:27:38 +08:00
杜建超
2b6265cb97 Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-10-29 15:23:03 +08:00
杜建超
5ab95765bc fix 2020-10-29 15:22:58 +08:00
wulin
b92dfdb974 保存节点的时候增加必备权限的复制 2020-10-29 15:07:16 +08:00
杜建超
b891041631 fix 2020-10-29 11:49:59 +08:00
杜建超
7f9e081707 fix 2020-10-29 11:44:12 +08:00
杜建超
cfe61f1a58 fix 2020-10-28 17:48:24 +08:00
杜建超
a350640b39 fix 2020-10-28 14:55:00 +08:00
杜建超
7e4896db90 fix 2020-10-28 11:38:19 +08:00
杜建超
a17ba44ad9 fix 2020-10-28 11:25:02 +08:00
杜建超
2b2ab2ff07 fix 2020-10-28 11:06:32 +08:00
杜建超
7546eb5ef4 task test 2020-10-28 10:48:24 +08:00
杜建超
4ac8b8d51c fix 2020-10-28 10:18:10 +08:00
杜建超
3e496962b1 fix 2020-10-27 17:04:15 +08:00
杜建超
82bfc20cd4 fiz 2020-10-27 16:45:40 +08:00
杜建超
1206daa643 Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-10-27 16:20:16 +08:00
杜建超
0df78fc7a3 fix 2020-10-27 16:20:12 +08:00
wulin
64efab57b9 Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-10-27 16:08:38 +08:00
wulin
0d33e10774 添加获取绩效详情 2020-10-27 16:08:33 +08:00
杜建超
fcf9ec460b Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-10-27 15:56:07 +08:00
杜建超
4f3a52596f fix 2020-10-27 15:56:03 +08:00
wulin
c8c492e9ad 解决冲突 2020-10-27 14:55:46 +08:00
wulin
b95bb856d1 发起考核时返回发起对象 2020-10-27 14:54:58 +08:00
杜建超
45ec4229bf Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-10-27 14:31:49 +08:00
杜建超
cebe1b1a55 fix 2020-10-27 14:31:44 +08:00
wulin
ede0acde37 引用初始化lz_flow_record表 2020-10-27 14:05:47 +08:00
杜建超
02510f9ee6 fix 2020-10-27 11:45:25 +08:00
杜建超
4c0ff8225e fix 2020-10-27 11:41:36 +08:00
杜建超
a774ec4bfa fix 2020-10-27 10:52:19 +08:00
杜建超
515dadf812 fix 2020-10-26 18:04:11 +08:00
杜建超
1ebb514d10 Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-10-26 17:05:52 +08:00
杜建超
353daceb41 fix 2020-10-26 17:05:46 +08:00
wulin
8ade53dfb1 Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-10-26 16:29:19 +08:00
wulin
86fc82ae8c 修复当人员在多个部门时,获取部门几级领导异常。目前搜索第一个为准 2020-10-26 16:29:14 +08:00
杜建超
2f519074d3 fix 2020-10-26 16:19:52 +08:00
杜建超
4681cb93fb fix 2020-10-26 16:19:25 +08:00
wulin
32b613501b Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-10-26 15:04:03 +08:00
wulin
2dbc72645e 一些操作放到service里面,并添加手动事务回滚操作 2020-10-26 15:03:58 +08:00
杜建超
1f9c89769c Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-10-26 14:28:44 +08:00
杜建超
82cade6318 fix 2020-10-26 14:28:40 +08:00
wulin
023876e362 修复发起考核bug 2020-10-26 14:08:21 +08:00
wulin
dd845a1ac7 Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-10-26 11:56:08 +08:00
wulin
ad3eefc453 lz_flow_approval_role修改roleId为String 2020-10-26 11:56:04 +08:00
quyixiao
ca52289161 提交修改 2020-10-26 11:51:39 +08:00
wulin
6cea3c3e7a Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-10-26 11:27:21 +08:00
wulin
b2ab60cb16 修复发起考核bug 2020-10-26 11:27:15 +08:00