From 2f2eb9a7c4e99e663c82d156bf5af7ecdbc8fa39 Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期一, 02 九月 2024 18:02:52 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj

---
 jrj/project/business/SystemSettings/SysUser.cpp |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/jrj/project/business/SystemSettings/SysUser.cpp b/jrj/project/business/SystemSettings/SysUser.cpp
index 02abbcf..a3b66d8 100644
--- a/jrj/project/business/SystemSettings/SysUser.cpp
+++ b/jrj/project/business/SystemSettings/SysUser.cpp
@@ -52,7 +52,7 @@
 		return 1;
 	}
 
-	int SetEntityData(param p)
+	int SetEntityData(LPARAM p)
 	{
 		xml x;
 
@@ -236,8 +236,8 @@
 			if (comdid == L"ok")
 			{
 				xstring strxml = arg.GetArgString(L"xml");
-				dw_user.SetItemDisplayString(row, colname, strxml);
-				dw_user.SetItemString(row, colname, strxml);
+				dw_user.SetItemDisplayString(row, colname.c_str(), strxml);
+				dw_user.SetItemString(row, colname.c_str(), strxml);
 				dw_user.Redraw();
 			}
 		}
@@ -310,8 +310,7 @@
 	{
 		m_agentNode = new xnode;
 
-		tv_usergroup = new treeview;
-		tv_usergroup.setNativePointer(GetControl(L"tv_usergroup"));
+		tv_usergroup = GetControl(L"tv_usergroup");
 		dw_user = new xdwgrid;
 		dw_user.setNativePointer(GetControl(L"dw_user"));
 		dw_user.SetDataObject(GetServerUrl(), L"dev:sheet[SysUser.tpl/UserList]");

--
Gitblit v1.9.3