Merge remote-tracking branch 'origin/master'

one_stop_public/Table/ZdyTable.jsx

@@ -853,10 +853,12 @@ export default class ZdyTable extends Component {
                                   }
                                   if (cell.uuid) {
                                     // debugger;
-                                    cell.content = {
-                                      ...cell.content,
-                                      ...getActiveJson(currentFormKey, cell.uuid),
-                                    };
+                                    if(cell.content){
+                                      cell.content = {
+                                        ...cell.content,
+                                        ...getActiveJson(currentFormKey, cell.uuid),
+                                      };
+                                    }
                                     // 27282 双选会报名后管理员修改举办时间 但是单位申请信息么有随着更新
                                   }
 

one_stop_public/Table/getActiveJson.js

 export default function getActiveJson(formKey = '', uuid = ''){
   if(!formKey || !uuid){
-    return {};
+    return undefined;
   }
   if(window.smartFormGlobalProps?.activeJsonConfig && window.smartFormGlobalProps.activeJsonConfig[formKey]){
-    return window.smartFormGlobalProps.activeJsonConfig[formKey][uuid] || {};
+    return window.smartFormGlobalProps.activeJsonConfig[formKey][uuid] || undefined;
   }
-  return {};
+  return undefined;
 }