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/project/business/SystemSettings/CommentaryEx.dialog.cpp | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/jrj/project/business/SystemSettings/CommentaryEx.dialog.cpp b/jrj/project/business/SystemSettings/CommentaryEx.dialog.cpp
index de715c6..82376a5 100644
--- a/jrj/project/business/SystemSettings/CommentaryEx.dialog.cpp
+++ b/jrj/project/business/SystemSettings/CommentaryEx.dialog.cpp
@@ -92,6 +92,7 @@
xstring guid = publiccode::GetGuid();
xstring str = guid.left(2);
xstring ret = xaserver::UploadFile(L"attachment" + str, guid + L".jpg", GetHWND(), L"", false);
+ int nIndex = m_cb.AddItem(ret.c_str(true), (guid + L".jpg").c_str(true));
showAtt();
return 1;
}
@@ -135,8 +136,12 @@
xstring value = m_Edit.GetText();
if (value == L"")
{
- alert(L"请填写批注！");
- return 1;
+ int s = m_cb.GetCount();
+ if (s < 1)
+ {
+ alert(L"请填写批注！");
+ return 1;
+ }
}
x.loadXML(L"<Commentary update.new='1' update.modify='1'/>");
--
Gitblit v1.9.3