diff --git a/src/main/java/com/yem/wm/im/inquirylist/form/InquirylistEdit.java b/src/main/java/com/yem/wm/im/inquirylist/form/InquirylistEdit.java
index 5a5f5aa5..df0e0f4f 100644
--- a/src/main/java/com/yem/wm/im/inquirylist/form/InquirylistEdit.java
+++ b/src/main/java/com/yem/wm/im/inquirylist/form/InquirylistEdit.java
@@ -92,7 +92,7 @@ public class InquirylistEdit extends AbstractBillPlugIn implements BeforeF7Selec
         Map<String, Object> map = new HashMap<>();
         List<Long> ids = new ArrayList();
         DynamicObject productModel = (DynamicObject) model.getValue("yem_productmodel", currentRowIndex);
-        DynamicObject products = yem_im_detailedinfor.get(0).getDynamicObject("yem_productmodel.yem_products");
+        DynamicObject products = yem_im_detailedinfor.get(currentRowIndex).getDynamicObject("yem_productmodel.yem_products");
         for (DynamicObject dynamicObject : yem_im_detailedinfor) {
             DynamicObjectCollection yem_multiconfig = dynamicObject.getDynamicObjectCollection("yem_multiconfig");
             if (yem_multiconfig != null) {
diff --git a/src/main/java/com/yem/wm/im/priceLibrary/form/OptionalFormPlugIn.java b/src/main/java/com/yem/wm/im/priceLibrary/form/OptionalFormPlugIn.java
index 06ff091d..c7388ed2 100644
--- a/src/main/java/com/yem/wm/im/priceLibrary/form/OptionalFormPlugIn.java
+++ b/src/main/java/com/yem/wm/im/priceLibrary/form/OptionalFormPlugIn.java
@@ -105,8 +105,8 @@ public class OptionalFormPlugIn extends AbstractFormPlugin implements Plugin {
                     continue;
                 }
                 int entryRow = model.createNewEntryRow("yem_optionalentry");
-                    model.setValue("yem_basemodel", productModel.getLong("id"), entryRow);
-                    model.setValue("yem_productmodel", productModel.getJSONObject("yem_products").getLong("id"), entryRow);
+                model.setValue("yem_basemodel", productModel.getLong("id"), entryRow);
+                model.setValue("yem_productmodel", productModel.getJSONObject("yem_products").getLong("id"), entryRow);
                 model.setValue("yem_profilenamea", optional.getString("yem_profilenamec"), entryRow);
                 model.setValue("yem_configure", optional.getString("yem_configure"), entryRow);
                 model.setValue("yem_parameter", optional.getString("yem_parameter"), entryRow);