fix-bug：6065首页报错

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/service/IPowerTransferCompanyResourcesService.java

@@ -28,4 +28,11 @@ public interface IPowerTransferCompanyResourcesService {
      * @return 车辆状态
      */
     PowerTransferCompanyResources getResourceById(String resourceId);
+
+    /**
+     * 根据ID获取资源数量   getResourceById修改
+     * @param resourceId
+     * @return
+     */
+    int getCarExecutingCountById(String resourceId, String status);
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/PowerTransferCompanyResourcesServiceImpl.java

@@ -93,4 +93,13 @@ public class PowerTransferCompanyResourcesServiceImpl extends BaseService<PowerT
         powerTransferCompanyResourcesQueryWrapper.eq("resources_id", resourceId);
         return powerTransferCompanyResourcesMapper.selectOne(powerTransferCompanyResourcesQueryWrapper);
     }
+
+    @Override
+    public int getCarExecutingCountById(String resourceId, String status) {
+        QueryWrapper<PowerTransferCompanyResources> powerTransferCompanyResourcesQueryWrapper = new QueryWrapper<>();
+        powerTransferCompanyResourcesQueryWrapper.eq("resources_id", resourceId);
+        powerTransferCompanyResourcesQueryWrapper.eq("status", status);
+        powerTransferCompanyResourcesQueryWrapper.eq("is_deleted", 0);
+        return powerTransferCompanyResourcesMapper.selectCount(powerTransferCompanyResourcesQueryWrapper);
+    }
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/UserCarServiceImpl.java

@@ -81,15 +81,17 @@ public class UserCarServiceImpl extends BaseService<AircraftDto, UserCar, UserCa
         if (userCar == null) {
             return 0;
         }
-        PowerTransferCompanyResources resource = companyResourcesService.getResourceById(userCar.getCarId().toString());
-        if (resource == null) {
-            return 0;
-        }
-        if ("executing".equals(resource.getCarStatus())) {
-            return 1;
-        } else {
-            return 0;
-        }
+        return companyResourcesService.getCarExecutingCountById(userCar.getRecUserId(), "executing");
+        //bug 6065 首页报错，接口selectOne 一个资源对应多条数据。
+//        PowerTransferCompanyResources resource = companyResourcesService.getResourceById(userCar.getCarId().toString());
+//        if (resource == null) {
+//            return 0;
+//        }
+//        if ("executing".equals(resource.getCarStatus())) {
+//            return 1;
+//        } else {
+//            return 0;
+//        }
     }
 
 }