Skip to content

yangxiujun / paidan_demo

Go to a project
Commit 978701b5 by 张晓
Options

fix 技术员中心点判空

1 parent e3f82f72
Inline Side-by-side
Showing with 13 additions and 9 deletions
project-order/src/main/java/com/dituhui/pea/order/service/impl/EngineerBusinessServiceImpl.java
...@@ -51,11 +51,13 @@ public class EngineerBusinessServiceImpl implements EngineerBusinessService { ...@@ -51,11 +51,13 @@ public class EngineerBusinessServiceImpl implements EngineerBusinessService {
public EngineerBusinessDTO.Group getGroupInfo(EngineerBusinessDTO.Request engineerReq) { public EngineerBusinessDTO.Group getGroupInfo(EngineerBusinessDTO.Request engineerReq) {
OrgGroupEntity groupEntity = orgGroupDao.getByGroupId(engineerReq.getLevelValue()); OrgGroupEntity groupEntity = orgGroupDao.getByGroupId(engineerReq.getLevelValue());
EngineerBusinessDTO.Group result = new EngineerBusinessDTO.Group(); EngineerBusinessDTO.Group result = new EngineerBusinessDTO.Group();
result.setGroupId(groupEntity.getGroupId()); if (groupEntity != null) {
result.setGroupName(groupEntity.getGroupName()); result.setGroupId(groupEntity.getGroupId());
result.setAddress(groupEntity.getAddress()); result.setGroupName(groupEntity.getGroupName());
result.setLocation(groupEntity.getX() + "," + groupEntity.getY()); result.setAddress(groupEntity.getAddress());
result.setWarehouseId(groupEntity.getWarehouseId()); result.setLocation(groupEntity.getX() + "," + groupEntity.getY());
result.setWarehouseId(groupEntity.getWarehouseId());
}
return result; return result;
} }
...@@ -63,10 +65,12 @@ public class EngineerBusinessServiceImpl implements EngineerBusinessService { ...@@ -63,10 +65,12 @@ public class EngineerBusinessServiceImpl implements EngineerBusinessService {
public EngineerBusinessDTO.WareHouse getWareHouse(String wareHouseId) { public EngineerBusinessDTO.WareHouse getWareHouse(String wareHouseId) {
OrgWarehouseInfoEntity item = warehouseInfoDao.getOrgWarehouseInfoEntityByWarehouseId(wareHouseId); OrgWarehouseInfoEntity item = warehouseInfoDao.getOrgWarehouseInfoEntityByWarehouseId(wareHouseId);
EngineerBusinessDTO.WareHouse wareHouse = new EngineerBusinessDTO.WareHouse(); EngineerBusinessDTO.WareHouse wareHouse = new EngineerBusinessDTO.WareHouse();
wareHouse.setWareHouseId(item.getWarehouseId()); if (item != null) {
wareHouse.setWareHouseName(item.getWarehouseName()); wareHouse.setWareHouseId(item.getWarehouseId());
wareHouse.setAddress(item.getAddress()); wareHouse.setWareHouseName(item.getWarehouseName());
wareHouse.setLocation(item.getX() + "," + item.getY()); wareHouse.setAddress(item.getAddress());
wareHouse.setLocation(item.getX() + "," + item.getY());
}
return wareHouse; return wareHouse;
} }
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!