From aa966512d0b4bc7fe9df2b0c5a38413db0ed3e4c Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期三, 03 七月 2024 23:12:40 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj
---
jrj/project/business/HR/ManpowerFileWindow.cpp | 6 ++++++
jrj/project/business/HR/AdministrativeDepartmentFolder.cpp | 1 +
jrj/project/business/HR/AdministrativeDepartment.cpp | 7 ++++---
jrj/ext-jrj/ext-jrj.vcxproj | 6 +++---
4 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/jrj/ext-jrj/ext-jrj.vcxproj b/jrj/ext-jrj/ext-jrj.vcxproj
index 0f2ce3c..f69ebbd 100644
--- a/jrj/ext-jrj/ext-jrj.vcxproj
+++ b/jrj/ext-jrj/ext-jrj.vcxproj
@@ -270,11 +270,11 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\project\business\HR\AdministrativeDepartment.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\project\business\HR\AdministrativeDepartmentFolder.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\project\business\HR\BlankExcelTemplate.cpp">
@@ -288,7 +288,7 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\project\business\HR\ManpowerFileWindow.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\project\business\PO\business4.cpp">
diff --git a/jrj/project/business/HR/AdministrativeDepartment.cpp b/jrj/project/business/HR/AdministrativeDepartment.cpp
index 12df8bb..7556789 100644
--- a/jrj/project/business/HR/AdministrativeDepartment.cpp
+++ b/jrj/project/business/HR/AdministrativeDepartment.cpp
@@ -121,7 +121,7 @@
int OnPreRetrieve()
{
HTREEITEM hItem = tv_folder.GetSelectedItem();
- if (hItem <= 0) return 1;
+ if (!hItem ) return 1;
//int hCursor = xutil::SetCursorWait();
KXMLDOMElement& e = *(KXMLDOMElement*)tv_folder.GetItemData(hItem);
@@ -152,7 +152,7 @@
if (changeddlb)
return 1;
HTREEITEM hItem = tv_folder.GetSelectedItem();
- if (hItem <= 0)
+ if (!hItem)
return 1;
HTREEITEM child = tv_folder.GetChildItem(hItem);
if (!child) {
@@ -178,7 +178,7 @@
int OnAdd()
{
HTREEITEM hItem = tv_folder.GetSelectedItem();
- if (hItem <= 0)
+ if (!hItem )
return 1;
HCURSOR hCursor = xutil::SetCursorWait();
KXMLDOMElement& e = *(KXMLDOMElement*)tv_folder.GetItemData(hItem);
@@ -304,6 +304,7 @@
AttachEvent(L"WM_XCOMMAND", (FEvent)&ViewAdministrativeDepartmentList::OnXCommand);
//获取焦点事件，用于重置工具条
AttachEvent(L"WM_SETFOCUS", (FEvent)&ViewAdministrativeDepartmentList::OnSetFocus);
+ return 1;
}
/*
diff --git a/jrj/project/business/HR/AdministrativeDepartmentFolder.cpp b/jrj/project/business/HR/AdministrativeDepartmentFolder.cpp
index 7bfefd8..103a4e1 100644
--- a/jrj/project/business/HR/AdministrativeDepartmentFolder.cpp
+++ b/jrj/project/business/HR/AdministrativeDepartmentFolder.cpp
@@ -109,6 +109,7 @@
AttachEvent(L"WM_XCOMMAND", (FEvent)&AdministrativeDepartmentFolderView::OnXCommand);
//获取焦点事件，用于重置工具条
AttachEvent(L"WM_SETFOCUS", (FEvent)&AdministrativeDepartmentFolderView::OnSetFocus);
+ return 1;
}
int OnParentRetrieve()
diff --git a/jrj/project/business/HR/ManpowerFileWindow.cpp b/jrj/project/business/HR/ManpowerFileWindow.cpp
index d6934e3..5dd1602 100644
--- a/jrj/project/business/HR/ManpowerFileWindow.cpp
+++ b/jrj/project/business/HR/ManpowerFileWindow.cpp
@@ -110,6 +110,7 @@
//获取焦点事件，用于重置工具条
AttachEvent(L"WM_SETFOCUS", (FEvent)&ViewManpowerFileWiondow::OnSetFocus);
AttachEvent(L"dw_base", L"DWV_ITEMCHANGING", (FEvent)&ViewManpowerFileWiondow::OnItemChanging);
+ return 1;
}
int OnItemChanging(TEvent* evt, LPARAM p)
@@ -118,6 +119,9 @@
xstring colname = hdr.colname;
xstring value = hdr.data;
int row = hdr.row;
+#if 0
+
+
if (value == L"") return 1;
xstring cellType = dw_base.GetColumnProp(colname, L"celltype");
@@ -131,6 +135,8 @@
return 1;
}
}
+#endif // 0
+ return 1;
}
int OnRetrieve()
--
Gitblit v1.9.3