领用无法正常保存

src/main/java/com/chinaitop/depot/device/controller/StorageDeviceGetController.java

@@ -135,6 +135,9 @@ public class StorageDeviceGetController {
         	//根据设备编号获取入库表的该设备信息
         	modelMap.put("number", storageDeviceget.getNumber());
         	modelMap.put("model", storageDeviceget.getModel());
+        	modelMap.put("deviceTypeId", storageDeviceget.getDeviceType());
+        	modelMap.put("deviceName", storageDeviceget.getDeviceName());
+        	modelMap.put("orgId", storageDeviceget.getOrgId());
         	List<StorageDeviceinput> inputList=deviceInputService.getUseCount(modelMap);
         	inputList.get(0).setStatus(4);//领用状态
         	inputList.get(0).setUseCount(inputList.get(0).getUseCount()-storageDeviceget.getGetCount());//数量减少

src/main/java/com/chinaitop/depot/device/mapper/StorageDeviceinputMapper.xml

@@ -613,8 +613,11 @@
 
    select <include refid="Base_Column_List" /> from storage_deviceinput where number=#{number} and model=#{model}
     and device_type=#{deviceTypeId} and
-    device_name In (select enumId from basic_enum where  enumName=#{deviceName}) and 
-    storage_rack IN (select id  from basic_equipment_equipment_pool where shelf_id=#{shelfId}) and org_id=#{orgId};
+    device_name In (select enumId from basic_enum where  enumName=#{deviceName}) 
+    <if test="shelfId != null">
+    and storage_rack IN (select id  from basic_equipment_equipment_pool where shelf_id=#{shelfId})
+    </if> 
+     and org_id=#{orgId};
 
   </select>