合并代码

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

@@ -437,7 +437,7 @@ public class WorkOrderManageController {
     public AjaxMessage<Object> selectOrderUserByOrgId(
             @ApiParam(value = "机构ID", required = true) @RequestParam(required = true) String ids){
         List<Map<String,Object>> result = new ArrayList<>();
-        AjaxMessage<List<UserEntity>> listAjaxMessage = userCenterClient.findUserIdsByOrgId(String.format("[%]",ids));
+        AjaxMessage<List<UserEntity>> listAjaxMessage = userCenterClient.findUserIdsByOrgId(String.format("[%s]",ids));
         for(UserEntity userEntity : listAjaxMessage.getData()){
             try {
                 Map<String, Object> orderStatusMap = workOrderManageService.selectOrderUserStatus(userEntity.getId().toString());
@@ -450,6 +450,11 @@ public class WorkOrderManageController {
                     map.put("status", orderStatusMap.get("S").toString());
                     map.put("address", orderStatusMap.get("X") + "," + orderStatusMap.get("Y"));
                 }
+                else
+                {
+                    map.put("status", "");
+                    map.put("address", "");
+                }
                 map.put("distance", "");
                 result.add(map);
             }catch (Exception e){