弹窗详情

chenxt
1 parent c702cfe8
Showing 2 changed files with 3 additions and 2 deletions
src/components/Common/CommonHooks/useCommonBase.js
src/mes/common/commonModelComponent/index.js
@@ -388,7 +388,7 @@ const useCommonBase = props =&gt; {
       delete condition.sSqlCondition
       delete condition.sId
       condition.sSqlCondition = {
-        sParentId: sId
+        sParentId: condition?.sSqlCondition?.sParentId
       }
     }
     // 只有弹窗没有不查询
@@ -787,6 +787,7 @@ const useCommonModelEvent = props =&gt; {
   // 获取数据集
   const handleGetData = async (tableList = [], isWait, bInit) => {
     let addState = {};
+    const { currentId } = props
     const currentIds = currentId ? currentId : props?.parentProps?.record?.sId
     for (let i = 0; i < tableList.length; i++) {
       const tableName = tableList[i];
@@ -902,7 +903,7 @@ const useCommonModelEvent = props =&gt; {
  
       const masterState = {};
       if (currentIds && tableName === 'master') {
-        masterState.sId = currentId;
+        masterState.sId = currentIds;
       }
       if (currentIds && tableName !== 'master') {
         conditonValues.sParentId = currentIds;