|
@@ -208,7 +208,9 @@ public class BaseCameraManagementController extends BaseController {
|
|
|
BaseRailwayManagement baseRailwayManagement = baseRailwayManagementService.getOne(queryWrapper);
|
|
|
SysDept sysDept = deptService.selectDeptById(o.getDeptId());
|
|
|
o.setDeptName(sysDept.getDeptName());
|
|
|
- o.setRailwayName(baseRailwayManagement.getRailwayName());
|
|
|
+ if (!StringUtils.isEmptySunhh(baseRailwayManagement) && !StringUtils.isEmptySunhh(baseRailwayManagement.getRailwayName())) {
|
|
|
+ o.setRailwayName(baseRailwayManagement.getRailwayName());
|
|
|
+ }
|
|
|
String mils = AppendUtils.stringAppend(o.getInstallMile());
|
|
|
o.setInstallMiles(mils);
|
|
|
if (!ObjectUtils.isEmpty(o.getEndMile())) {
|