修改

operation_manager/src/main/java/com/huaxu/order/controller/WorkOrderManageController.java

@@ -599,15 +599,25 @@ public class WorkOrderManageController {
                 map.put("deptName", userEntity.getDeptOrgName());
                 if (orderStatusMap != null) {
                     map.put("status", orderStatusMap.get("S").toString());
-                    map.put("address", orderStatusMap.get("X") + "," + orderStatusMap.get("Y"));
-                    if(!org.apache.commons.lang3.StringUtils.isEmpty(wkid) && wkid.equals("2360")){
+                    map.put("address", orderStatusMap.get("X")==null?"-":orderStatusMap.get("X").toString() + "," + orderStatusMap.get("Y")==null?"-":orderStatusMap.get("Y").toString());
+                    if(!org.apache.commons.lang3.StringUtils.isEmpty(wkid)
+                            && wkid.equals("2360")
+                            && orderStatusMap.get("X")!=null
+                            && orderStatusMap.get("Y")!=null){
+
                         MyPoint myPoint= ConvertXY.ConvertXYToXian80(orderStatusMap.get("X").toString(),
                                 orderStatusMap.get("Y").toString(),moveXY);
                         map.put("coords",myPoint.getX()+","+myPoint.getY());
-                    }else if(!org.apache.commons.lang3.StringUtils.isEmpty(wkid) && wkid.equals("3857")){
+                    }else if(!org.apache.commons.lang3.StringUtils.isEmpty(wkid)
+                            && wkid.equals("3857")
+                            && orderStatusMap.get("X")!=null
+                            && orderStatusMap.get("Y")!=null){
                         MyPoint myPoint= ConvertXY.ConvertXYToMercato(orderStatusMap.get("X").toString(),
                                 orderStatusMap.get("Y").toString(),moveXY);
                         map.put("coords",myPoint.getX()+","+myPoint.getY());
+                    }else
+                    {
+                        map.put("coords","");
                     }
                 }
                 else {