fix 技术员中心点判空

project-order/src/main/java/com/dituhui/pea/order/service/impl/EngineerBusinessServiceImpl.java

@@ -51,11 +51,13 @@ public class EngineerBusinessServiceImpl implements EngineerBusinessService {
     public EngineerBusinessDTO.Group getGroupInfo(EngineerBusinessDTO.Request engineerReq) {
         OrgGroupEntity groupEntity = orgGroupDao.getByGroupId(engineerReq.getLevelValue());
         EngineerBusinessDTO.Group result = new EngineerBusinessDTO.Group();
-        result.setGroupId(groupEntity.getGroupId());
-        result.setGroupName(groupEntity.getGroupName());
-        result.setAddress(groupEntity.getAddress());
-        result.setLocation(groupEntity.getX() + "," + groupEntity.getY());
-        result.setWarehouseId(groupEntity.getWarehouseId());
+        if (groupEntity != null) {
+            result.setGroupId(groupEntity.getGroupId());
+            result.setGroupName(groupEntity.getGroupName());
+            result.setAddress(groupEntity.getAddress());
+            result.setLocation(groupEntity.getX() + "," + groupEntity.getY());
+            result.setWarehouseId(groupEntity.getWarehouseId());
+        }
         return result;
     }
 
@@ -63,10 +65,12 @@ public class EngineerBusinessServiceImpl implements EngineerBusinessService {
     public EngineerBusinessDTO.WareHouse getWareHouse(String wareHouseId) {
         OrgWarehouseInfoEntity item = warehouseInfoDao.getOrgWarehouseInfoEntityByWarehouseId(wareHouseId);
         EngineerBusinessDTO.WareHouse wareHouse = new EngineerBusinessDTO.WareHouse();
-        wareHouse.setWareHouseId(item.getWarehouseId());
-        wareHouse.setWareHouseName(item.getWarehouseName());
-        wareHouse.setAddress(item.getAddress());
-        wareHouse.setLocation(item.getX() + "," + item.getY());
+        if (item != null) {
+            wareHouse.setWareHouseId(item.getWarehouseId());
+            wareHouse.setWareHouseName(item.getWarehouseName());
+            wareHouse.setAddress(item.getAddress());
+            wareHouse.setLocation(item.getX() + "," + item.getY());
+        }
         return wareHouse;
 
     }