|
@@ -91,13 +91,20 @@ public class AttendanceRuleCategoryController {
|
|
|
AddAttendanceUserRelationDto relationDto = JSONUtil.toBean(jsonElement.getAsJsonObject().toString(), AddAttendanceUserRelationDto.class);
|
|
AddAttendanceUserRelationDto relationDto = JSONUtil.toBean(jsonElement.getAsJsonObject().toString(), AddAttendanceUserRelationDto.class);
|
|
|
if(relationDto.getUserId() != null){
|
|
if(relationDto.getUserId() != null){
|
|
|
XjrUser xjrUser = xjrUserService.getById(relationDto.getUserId());
|
|
XjrUser xjrUser = xjrUserService.getById(relationDto.getUserId());
|
|
|
- relationDto.setName(xjrUser.getName());
|
|
|
|
|
|
|
+ if(xjrUser != null){
|
|
|
|
|
+ relationDto.setName(xjrUser.getName());
|
|
|
|
|
+ }
|
|
|
}else if(relationDto.getDeptId() != null){
|
|
}else if(relationDto.getDeptId() != null){
|
|
|
Department department = departmentService.getById(relationDto.getDeptId());
|
|
Department department = departmentService.getById(relationDto.getDeptId());
|
|
|
- relationDto.setName(department.getName());
|
|
|
|
|
|
|
+ if(department != null){
|
|
|
|
|
+ relationDto.setName(department.getName());
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
}else if(relationDto.getClassId() != null){
|
|
}else if(relationDto.getClassId() != null){
|
|
|
BaseClass aClass = classService.getById(relationDto.getClassId());
|
|
BaseClass aClass = classService.getById(relationDto.getClassId());
|
|
|
- relationDto.setName(aClass.getName());
|
|
|
|
|
|
|
+ if(aClass != null){
|
|
|
|
|
+ relationDto.setName(aClass.getName());
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
attendanceUserRelationList.add(relationDto);
|
|
attendanceUserRelationList.add(relationDto);
|
|
|
}
|
|
}
|