广告合同数据导入修复

zhangjq

2026-02-04 fd1b814c40f7bef0a72062426a810e614b78b597

广告合同数据导入修复

 public/components/property/importContract/importContract.js

@@ -51,7 +51,7 @@
                param.append("uploadFile", $that.importContractInfo.excelTemplate);
                param.append('communityId', vc.getCurrentCommunity().communityId);
                param.append('userId', vc.getData('/nav/getUserInfo').userId)
                param.append('importAdapt', "importContractV2");
                param.append('importAdapt', "importContract");

                vc.http.upload(
                    'assetImport',
@@ -70,7 +70,7 @@
                            //关闭model
                            vc.toast("处理成功");
                            $('#importContractModel').modal('hide');
                            vc.jumpToPage('/#/pages/property/assetImportLogDetail?logId=' + _json.data.logId + '&logType=importContractV2');
                            vc.jumpToPage('/#/pages/property/assetImportLogDetail?logId=' + _json.data.logId + '&logType=importContract');
                            return;
                        }
                        vc.toast(_json.msg, 10000);

 public/pages/admin/advertisementSummary/advertisementSummary.js

@@ -247,16 +247,53 @@
                console.log('importAdapt:', 'importContractV2');
                
                // 使用实际的userId，如果没有则使用默认值
                let userId = vc.getData() && vc.getData().userInfo && vc.getData().userInfo.userId ? vc.getData().userInfo.userId : '-1';
                console.log('userId:', userId);
                let userId = '-1';
                let userName = '';
                
                // 构建表单数据，与车辆导入保持一致
                // 尝试从localStorage获取用户信息
                let localUserInfo = localStorage.getItem('userInfo');
                if (localUserInfo) {
                    try {
                        localUserInfo = JSON.parse(localUserInfo);
                        userId = localUserInfo.userId || '-1';
                        userName = localUserInfo.name || '';
                        console.log('从localStorage获取的用户信息:', localUserInfo);
                        console.log('从localStorage获取的userId:', userId);
                        console.log('从localStorage获取的userName:', userName);
                    } catch (e) {
                        console.log('解析localStorage用户信息失败:', e);
                    }
                }
                
                // 如果localStorage获取失败，尝试第一种方式
                if (userId === '-1') {
                    let userInfo = vc.getData('/nav/getUserInfo');
                    userId = userInfo && userInfo.userId ? userInfo.userId : '-1';
                    userName = userInfo && userInfo.name ? userInfo.name : '';
                    console.log('第一种方式获取用户信息:', userInfo);
                    console.log('第一种方式获取的userId:', userId);
                    console.log('第一种方式获取的userName:', userName);
                }
                
                // 如果第一种方式失败，尝试第二种方式
                if (userId === '-1') {
                    let userInfo = vc.getData() && vc.getData().userInfo ? vc.getData().userInfo : null;
                    userId = userInfo && userInfo.userId ? userInfo.userId : '-1';
                    userName = userInfo && userInfo.name ? userInfo.name : '';
                    console.log('第二种方式获取用户信息:', userInfo);
                    console.log('第二种方式获取的userId:', userId);
                    console.log('第二种方式获取的userName:', userName);
                }
                
                console.log('最终使用的userId:', userId);
                console.log('最终使用的userName:', userName);
                
                // 构建表单数据，只需要四个参数
                var formData = new FormData();
                formData.append("uploadFile", file); // 添加Excel文件
                formData.append('communityId', vc.getCurrentCommunity().communityId); // 添加小区ID
                formData.append('importAdapt', "importContractV2"); // 指定使用的导入适配器
                formData.append('userId', userId); // 添加userId参数
                formData.append('USER-ID', userId); // 添加USER-ID参数（大写形式），与车辆导入保持一致
                formData.append('userid', userId); // 添加userid参数（小写d）
                
                // 发送导入请求，与车辆导入保持一致
                vc.http.upload(