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

提交和

Browse Source
This commit is contained in:
quyixiao 2020-12-28 10:24:06 +08:00
parent b40811d2d7
commit fb8627a020
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1400,9 +1400,11 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
flowDetailResp.setStatus(status); flowDetailResp.setStatus(status);
StaffEntity staffEntity = staffService.selectStaffById(flowRecord.getApprovalStaffId()); StaffEntity staffEntity = staffService.selectStaffById(flowRecord.getApprovalStaffId());
DepartmentsStaffRelateEntity departmentsStaffRelateEntity = departmentsStaffRelateService.selectLastDepartmentByStaffId(flowRecord.getApprovalStaffId()); DepartmentsStaffRelateEntity departmentsStaffRelateEntity = departmentsStaffRelateService.selectLastDepartmentByStaffId(flowRecord.getApprovalStaffId());
flowDetailResp.setAvatar(staffEntity.getAvatar()); if(departmentsStaffRelateEntity !=null ){
DepartmentsEntity departmentsEntity = departmentsDao.selectByDepartmentId(departmentsStaffRelateEntity.getDepartmentId()); flowDetailResp.setAvatar(staffEntity.getAvatar());
flowDetailResp.setDepartName(departmentsEntity.getDepartmentName()); DepartmentsEntity departmentsEntity = departmentsDao.selectByDepartmentId(departmentsStaffRelateEntity.getDepartmentId());
flowDetailResp.setDepartName(departmentsEntity.getDepartmentName());
}
if (new Integer(0).equals(flowRecord.getStatus()) || new Integer(2).equals(flowRecord.getStatus())) { if (new Integer(0).equals(flowRecord.getStatus()) || new Integer(2).equals(flowRecord.getStatus())) {
int position = getRole(loginUserId, departmentsStaffRelateEntity); int position = getRole(loginUserId, departmentsStaffRelateEntity);
/** /**
@ -1422,6 +1424,9 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
public int getRole(Long loginUserId, DepartmentsStaffRelateEntity departmentsStaffRelateEntity) { public int getRole(Long loginUserId, DepartmentsStaffRelateEntity departmentsStaffRelateEntity) {
if(departmentsStaffRelateEntity == null ){
return 0 ;
}
int position = 0; int position = 0;
StaffRole staffRole = staffRoleService.selectStaffRolesByStaffIdDepartmentLevelList(loginUserId, StaffRole staffRole = staffRoleService.selectStaffRolesByStaffIdDepartmentLevelList(loginUserId,
Arrays.asList(new String[]{RoleEnums.CHILD_PM.getName(), RoleEnums.MASTER_PM.getName()})); Arrays.asList(new String[]{RoleEnums.CHILD_PM.getName(), RoleEnums.MASTER_PM.getName()}));