wulin/wl_management
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'version_1.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_1.0

Browse Source
This commit is contained in:
wulin 2020-08-28 11:31:50 +08:00
commit 51e3e711ac
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java
View File

@ -170,13 +170,13 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
params.setDepartmentIds(departmentIds); params.setDepartmentIds(departmentIds);
String departmentLevel = Constant.ME; String departmentLevel = Constant.ME;
if (params.getIsSelf() != 1) { // 表示点击我们审批 if (params.getIsSelf() != 1) { // 表示点击我们审批
FlowDepartment flowDepartment = flowDepartmentService.selectByStaffId(user.getUserId()); StaffRole staffRole = staffRoleService.selectByStaffId(user.getUserId());
if (flowDepartment != null) { if (staffRole != null) {
departmentLevel = flowDepartment.getDepartmentLevel(); departmentLevel = staffRole.getDepartmentLevel();
} else { } else {
StaffRole staffRole = staffRoleService.selectByStaffId(user.getUserId()); FlowDepartment flowDepartment = flowDepartmentService.selectByStaffId(user.getUserId());
if (staffRole != null) { if (flowDepartment != null) {
departmentLevel = staffRole.getDepartmentLevel(); departmentLevel = flowDepartment.getDepartmentLevel();
} }
} }
} }