Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj

xj qian

2025-03-13 cf8dba7748cc9826d744069b5063a14e3fcd2fa8

 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'/>");