diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java
index 679dc44d..6149679a 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java
@@ -540,6 +540,9 @@ public class LeaseApplyInfoServiceImpl implements ILeaseApplyInfoService {
             list.addAll(leaseApplyOutList);
         }
         for (LeaseApplyInfo applyInfo : list) {
+            if (applyInfo.getTaskStatus() != null && applyInfo.getTaskStatus() == 1) {
+                continue;
+            }
             if (applyInfo.getPreCountNum().compareTo(applyInfo.getAlNum()) == 0) {
                 applyInfo.setTaskStatus(LeaseTaskStatusEnum.LEASE_TASK_FINISHED.getStatus());
                 applyInfo.setTaskStatusName(LeaseTaskStatusEnum.LEASE_TASK_FINISHED.getStatusName());
@@ -1245,7 +1248,7 @@ public class LeaseApplyInfoServiceImpl implements ILeaseApplyInfoService {
     @Override
     public AjaxResult leaseOut(LeaseOutRequestVo leaseOutRequestVo) {
         // 判断库存是否充足
-        if (!CollectionUtils.isEmpty(leaseOutRequestVo.getLeaseOutDetailsList())) {
+        /*if (!CollectionUtils.isEmpty(leaseOutRequestVo.getLeaseOutDetailsList())) {
             LeaseOutDetails leaseOutDetails = leaseOutRequestVo.getLeaseOutDetailsList().get(0);
             if (leaseOutDetails != null) {
                 if (leaseOutDetails.getManageType().equals(MaTypeManageTypeEnum.NUMBER_DEVICE.getTypeId())) {
@@ -1261,7 +1264,7 @@ public class LeaseApplyInfoServiceImpl implements ILeaseApplyInfoService {
                     }
                 }
             }
-        }
+        }*/
         for (LeaseOutDetails bean : leaseOutRequestVo.getLeaseOutDetailsList()) {
             if (Objects.isNull(bean)) {
                 continue;
diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyDetailsMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyDetailsMapper.xml
index 7051b9ab..e4f966b2 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyDetailsMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyDetailsMapper.xml
@@ -696,7 +696,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         FROM
             lease_apply_details
         WHERE
-            parent_id = #{parentId} and type_id = #{typeId}
+            parent_id = #{parentId} and COALESCE(new_type, type_id) = #{typeId}
     </select>
 
 </mapper>