From 4161b991dc09760ea8ed92ba840099f4102dc5e2 Mon Sep 17 00:00:00 2001
From: qianxj2004 <qianxj15@sina.com>
Date: 星期三, 22 十月 2025 16:53:14 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj
---
jrj/xframe/vbusiness/vframe/listex.vframe.vbusiness.hpp | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/jrj/xframe/vbusiness/vframe/listex.vframe.vbusiness.hpp b/jrj/xframe/vbusiness/vframe/listex.vframe.vbusiness.hpp
index dea137f..7d49ef7 100644
--- a/jrj/xframe/vbusiness/vframe/listex.vframe.vbusiness.hpp
+++ b/jrj/xframe/vbusiness/vframe/listex.vframe.vbusiness.hpp
@@ -437,7 +437,7 @@
else continue;
KXMLDOMElement colename = e.selectSingleNode(L"//row[@rowindex='5']/cell[@colindex='" + colindex + L"']");
//查询列
- string searchcolumn = searchcol(colename);
+ xstring searchcolumn = searchcol(colename);
if (searchcolumn == L"否") continue;
//英文名
string ename = colename.selectSingleNode(L"@column").text();
@@ -506,7 +506,7 @@
{
KXMLDOMDocument x;
int ret = getUrl(tpl, L"<args/>", x);
- if (ret == 1 && x.xml() != L"")
+ if (ret == 1 && (xstring)x.xml() != L"")
{
setSheetSearch(x);
}
@@ -524,7 +524,7 @@
//alert("ex");
int h = dw_col.GetCurSel();
if (h < 0) return L"";
- string str = (string)dw_col.GetItemData(h);
+ xstring str = (string)dw_col.GetItemData(h);
KXMLDOMDocument x;
if (x.loadXML(str))
{
--
Gitblit v1.9.3