From e05f7cc8755eb7f5525e6bf86a7e5454a0c91fd0 Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期三, 23 十月 2024 18:07:24 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj
---
jrj/project/business/SystemSettings/SysUser.cpp | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/jrj/project/business/SystemSettings/SysUser.cpp b/jrj/project/business/SystemSettings/SysUser.cpp
index 4155add..5b4161b 100644
--- a/jrj/project/business/SystemSettings/SysUser.cpp
+++ b/jrj/project/business/SystemSettings/SysUser.cpp
@@ -52,11 +52,11 @@
return 1;
}
- int SetEntityData(LPARAM p)
+ int SetEntityData(xaserverarg arg)
{
xml x;
- xaserverarg arg;
+ //xaserverarg arg;
xstring str = m_QueryTxt;
//trace(ele.xml);
@@ -117,7 +117,7 @@
alert(L"请选择职位！");
return 0;
}
- OpenWindow(L"dev:xpage[UserImport.vx]");
+ OpenWindow(L"dev:xpage[UserImport.vx]",(LPARAM)this);
//openUrl(L"系统用户.vface/xpage/SysUser/UserImport", this);
return 1;
}
@@ -326,7 +326,6 @@
x.loadXML(L"<Config/>");
m_configDoc = x;
rowSearch(L"系统用户.vface/template/SysUser/list");
- return 1;
GridSearchEx();
return 1;
--
Gitblit v1.9.3