商业合作伙伴 total显示问题

mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/UserServiceFeign.java

@@ -9,6 +9,7 @@ import com.mhd.common.core.domain.dto.UserDriverDTO;
 import com.mhd.common.core.domain.entity.R;
 import com.mhd.common.core.domain.todo.StatisticalMattersDo;
 import com.mhd.common.core.web.domain.AjaxResult;
+import com.mhd.common.core.web.page.TableDataInfo;
 import com.mhd.system.api.domain.UserDTO;
 import com.mhd.system.api.domain.UserShipperQueryDTO;
 import com.mhd.system.api.domain.UserUpdateDTO;
@@ -200,7 +201,7 @@ public interface UserServiceFeign {
 
     @ApiOperation("商业合作伙伴-分页查询托运人列表")
     @GetMapping("/userShipperApi/userShipperList")
-    public AjaxResult<?> userShipperList(@SpringQueryMap UserShipperQueryDTO userShipperQueryDTO);
+    public TableDataInfo userShipperList(@SpringQueryMap UserShipperQueryDTO userShipperQueryDTO);
 
 
     @PostMapping("/userShipperApi/updatePushStatus")

mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/factory/RemoteUserFeignFallbackFactory.java

@@ -5,6 +5,7 @@ import com.mhd.common.core.domain.dto.StatisticalMattersDTO;
 import com.mhd.common.core.domain.dto.UserDataPermissionQueryDTO;
 import com.mhd.common.core.domain.dto.UserDriverDTO;
 import com.mhd.common.core.web.domain.AjaxResult;
+import com.mhd.common.core.web.page.TableDataInfo;
 import com.mhd.system.api.UserServiceFeign;
 import com.mhd.system.api.domain.UserDTO;
 import com.mhd.system.api.domain.UserShipperQueryDTO;
@@ -20,6 +21,7 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -185,8 +187,13 @@ public class RemoteUserFeignFallbackFactory implements FallbackFactory<UserServi
             }
 
             @Override
-            public AjaxResult<?> userShipperList(UserShipperQueryDTO userShipperQueryDTO) {
+            public TableDataInfo userShipperList(UserShipperQueryDTO userShipperQueryDTO) {
-                return  AjaxResult.error("查询失败" + throwable.getMessage());
+                TableDataInfo tableDataInfo = new TableDataInfo();
+                tableDataInfo.setData(new ArrayList<>());
+                tableDataInfo.setTotal(0);
+                tableDataInfo.setCode(500);
+                tableDataInfo.setMsg("查询失败:" + throwable.getMessage());
+                return tableDataInfo;
             }
 
 

mhd_oms/src/main/java/com/mhd/oms/application/service/businessPartner/BusinessPartnerApplicationService.java

@@ -55,18 +55,20 @@ public class BusinessPartnerApplicationService {
             userShipperQueryDTO.setOrganizationId(String.valueOf(businessPartnerDTO.getOrganizationId()));
         }
 
-        AjaxResult<?> result = userServiceFeign.userShipperList(userShipperQueryDTO);
+        try {
-
+            TableDataInfo userTableDataInfo = userServiceFeign.userShipperList(userShipperQueryDTO);
-        if ("200".equals((String.valueOf(result.get("code"))))){
-            List<?> list = (List<?>) result.get("data");
 
             TableDataInfo tableDataInfo = new TableDataInfo();
-            tableDataInfo.setData(list);
+            tableDataInfo.setData(userTableDataInfo.getData());
-            tableDataInfo.setTotal(list.size());
+            tableDataInfo.setTotal(userTableDataInfo.getTotal());
             tableDataInfo.setCode(200);
             return tableDataInfo;
+        } catch (Exception e) {
+            log.error("查询托运人列表异常: {}", e.getMessage());
+            TableDataInfo tableDataInfo = new TableDataInfo();
+            tableDataInfo.setCode(500);
+            return tableDataInfo;
         }
-        return null;
     }
 
 
@@ -77,6 +79,7 @@ public class BusinessPartnerApplicationService {
 
         LoginUser loginUser = SecurityUtils.getLoginUser();
         Long pushBy = loginUser != null ? loginUser.getUserid() : null;
+        String pushByName = loginUser != null ? loginUser.getUsername() : null;
         Long organizationId = loginUser != null ? loginUser.getUserPo().getOrganizationId() : null;
         Long topOrganizationId = loginUser != null ? loginUser.getUserPo().getTopOrganizationId() : null;
         String organizationName = loginUser != null ? loginUser.getUserPo().getOrganizationName() : null;