From a24a99da3f57ca960e0bde4df1cb4799e6254b30 Mon Sep 17 00:00:00 2001
From: LiFan <2308045698@qq.com>
Date: 星期二, 16 七月 2024 12:36:30 +0800
Subject: [PATCH] update
---
jrj/project/business/Company/HrOrg.cpp | 6 +++---
jrj/project/business/Company/HrJob.cpp | 4 ++--
jrj/project/business/Company/HrEmployee.hpp | 2 +-
jrj/project/business/Company/HrOrgMaint.cpp | 4 ++--
jrj/project/business/Company/HrOrgChart.cpp | 5 +++--
5 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/jrj/project/business/Company/HrEmployee.hpp b/jrj/project/business/Company/HrEmployee.hpp
index 8b0d117..40e74f4 100644
--- a/jrj/project/business/Company/HrEmployee.hpp
+++ b/jrj/project/business/Company/HrEmployee.hpp
@@ -110,7 +110,7 @@
int OnSubTree(xstring id, HTREEITEM parentitem)
{
//int wid = tv_org.GetId();
- if (tv_org.GetChildItem(parentitem) > 0) return 1;
+ if (!tv_org.GetChildItem(parentitem)) return 1;
xml x;
xaserverarg arg;
diff --git a/jrj/project/business/Company/HrJob.cpp b/jrj/project/business/Company/HrJob.cpp
index bdb4723..53cf3c9 100644
--- a/jrj/project/business/Company/HrJob.cpp
+++ b/jrj/project/business/Company/HrJob.cpp
@@ -81,12 +81,12 @@
int OnTreeSelChanged(TEvent* evt, int p)
{
NMTREEVIEW& nmtv = *(NMTREEVIEW*)evt->notify.pnmh;
- HTREEITEM hItem = nmtv.itemNew.hItem;
+ //HTREEITEM hItem = nmtv.itemNew.hItem;
//int wid = tv_1.GetId();
HTREEITEM hItem = tv_1.GetSelectedItem();
HTREEITEM rootItem = tv_1.GetRootItem();
- if (hItem <= 0 || hItem == rootItem)
+ if (!hItem || hItem == rootItem)
{
m_type = L"all";
}
diff --git a/jrj/project/business/Company/HrOrg.cpp b/jrj/project/business/Company/HrOrg.cpp
index 46d9dc0..a8628a1 100644
--- a/jrj/project/business/Company/HrOrg.cpp
+++ b/jrj/project/business/Company/HrOrg.cpp
@@ -100,7 +100,7 @@
int i = 0, s = list.length();
KXMLDOMElement xitem;
xstring sname;
- xstring sguid;
+ //xstring sguid;
if (s > 0)
{
for (i = 0; i < s; i++)
@@ -392,7 +392,7 @@
tv_org = GetControl(L"tv_org");
AttachEvent(L"tv_org", L"TVN_SELCHANGED", (FEvent)&HrOrg::OnTreeSelecded);
HTREEITEM root = tv_org.GetRootItem();
- if (root > 0)
+ if (!root)
{
tv_org.ExpandItemEx(root);
}
@@ -473,7 +473,7 @@
//OnCreateTree(L"00000000-0000-0000-0000-000000000000", 0);
HTREEITEM root = tv_org.GetRootItem();
- if (root > 0)
+ if (!root)
{
tv_org.ExpandItemEx(root);
KXMLDOMElement ele = tv_org.GetItemData(root);
diff --git a/jrj/project/business/Company/HrOrgChart.cpp b/jrj/project/business/Company/HrOrgChart.cpp
index 7e1e781..b8d02e8 100644
--- a/jrj/project/business/Company/HrOrgChart.cpp
+++ b/jrj/project/business/Company/HrOrgChart.cpp
@@ -36,7 +36,7 @@
xstring pUnit;
pUnit = tv_org.GetItemLabel(hitem) + L"\\";
HTREEITEM pitem = tv_org.GetParentItem(hitem);
- while (pitem > 0)
+ while (!pitem )
{
pUnit = tv_org.GetItemLabel(pitem) + L"\\" + pUnit;
pitem = tv_org.GetParentItem(pitem);
@@ -61,6 +61,7 @@
}
if(lw !=WA_INACTIVE)m_bCanDestroy = 1;
return 1;*/
+ return 1;
}
//焦点激活处理函数
@@ -76,7 +77,7 @@
arg = GetArg();
arg.AddArg(L"comdid", comdid);
HTREEITEM hitem = tv_org.GetSelectedItem();
- if (hitem > 0)
+ if (!hitem )
{
KXMLDOMElement ele = tv_org.GetItemData( hitem);
xstring guid = ele.selectSingleNode(L"@guid").text();
diff --git a/jrj/project/business/Company/HrOrgMaint.cpp b/jrj/project/business/Company/HrOrgMaint.cpp
index f228299..be0677a 100644
--- a/jrj/project/business/Company/HrOrgMaint.cpp
+++ b/jrj/project/business/Company/HrOrgMaint.cpp
@@ -202,8 +202,8 @@
xstring sPersonID = arg.GetArgString(L"sPersonID");
//trace(sPersonID);
xstring sPersonName = arg.GetArgString(L"sPersonName");
- dw_detail.SetItemDisplayString(1, colname, sPersonName);
- dw_detail.SetItemString(1, colname, sPersonID);
+ dw_detail.SetItemDisplayString(1, colname.c_str(), sPersonName);
+ dw_detail.SetItemString(1, colname.c_str(), sPersonID);
dw_detail.Redraw();
}
}
--
Gitblit v1.9.3