Merge branch 'master' of https://mc.cloudpure.cn/mjava/cont

mjava-huagao/src/main/java/com/malk/huagao/service/impl/YdHuaGaoServiceImpl.java

@@ -511,10 +511,9 @@ public class YdHuaGaoServiceImpl implements YdHuaGaoService {
                     if (ddlist != null && !ddlist.isEmpty()) {
                         for (Map<String, Object> khitem : ddlist) {
                             Map<String, Object> khformData = (Map<String, Object>) khitem.get("formData");
-
                             if (khformData != null && ckddjbh.equals(khformData.get("textField_mg34txgm"))) {
                                 ckdformInstanceId = (String) khitem.get("formInstanceId");
-                                ckdbh = (String) khformData.get("textField_mejnamf2");
+                                ckdbh = (String) khformData.get("textField_mg34txgm");
                                 break;
                             }
                         }
@@ -529,15 +528,15 @@ public class YdHuaGaoServiceImpl implements YdHuaGaoService {
                 } catch (Exception e) {
                     log.error("查询订单数据异常: ckdbh={}, 错误信息={}", ckdbh, e.getMessage(), e);
                 }
-                HashMap<Object, Object> updateMap = new HashMap<>();
-                updateMap.put("tableField_mh9woanl", tableList);
-                if (ckdbh != null && ckdformInstanceId != null) {
-                    updateMap.put("associationFormField_mejmtick",
-                            Arrays.asList(getysdAss(ckdbh,ckdformInstanceId)));
-                }
+
+
                 // 构建主表数据
                 HashMap<Object, Object> updateData = new HashMap<>();
                 updateData.put("tableField_mf6el3zx", tableList);
+                if (ckdbh != null && ckdformInstanceId != null) {
+                    updateData.put("associationFormField_mejmtick",
+                            Arrays.asList(getysdAss(ckdbh,ckdformInstanceId)));
+                }
                 updateData.put("tableField_mhiui6v5", tableListPay);
                 updateData.put("textField_mg3a0tgs", kdYdReceivable.getDjbh());
                 updateData.put("selectField_mg3a0th4", kdYdReceivable.getDjlx());