fixed:crashed and does not send self when notify msg

Author: xengine-qyt

XEngine_Source/MQCore_DBModule/DBModule_MQUser/DBModule_MQUser.cpp

@@ -428,7 +428,7 @@ BOOL CDBModule_MQUser::DBModule_MQUser_KeyList(LPCTSTR lpszUser, LPCTSTR lpszKey
 {
 	DBModule_IsErrorOccur = FALSE;
 
-	if ((NULL == lpszUser) || (NULL == lpszKeyName))
+	if ((NULL == lpszUser) && (NULL == lpszKeyName))
 	{
 		DBModule_IsErrorOccur = TRUE;
 		DBModule_dwErrorCode = ERROR_XENGINE_MQCORE_DATABASE_PARAMENT;
@@ -442,15 +442,15 @@ BOOL CDBModule_MQUser::DBModule_MQUser_KeyList(LPCTSTR lpszUser, LPCTSTR lpszKey
 	TCHAR tszSQLStatement[1024];
 	memset(tszSQLStatement, '\0', sizeof(tszSQLStatement));
 	//名称为,消息名为必填
-	if ((_tcslen(lpszUser) > 0) && (_tcslen(lpszKeyName) > 0))
+	if ((NULL != lpszUser) && (NULL != lpszKeyName))
 	{
 		_stprintf_s(tszSQLStatement, _T("SELECT * FROM `UserKey` WHERE tszKeyUser = '%s' AND tszKeyName = '%s'"), lpszUser, lpszKeyName);
 	}
-	else if ((_tcslen(lpszUser) > 0) && (_tcslen(lpszKeyName) <= 0))
+	else if ((NULL != lpszUser) && (NULL == lpszKeyName))
 	{
 		_stprintf_s(tszSQLStatement, _T("SELECT * FROM `UserKey` WHERE tszKeyUser = '%s'"), lpszUser);
 	}
-	else if ((_tcslen(lpszUser) <= 0) && (_tcslen(lpszKeyName) > 0))
+	else if ((NULL == lpszUser) && (NULL != lpszKeyName))
 	{
 		_stprintf_s(tszSQLStatement, _T("SELECT * FROM `UserKey` WHERE tszKeyName = '%s'"), lpszKeyName);
 	}

XEngine_Source/XEngine_MQServiceApp/MQService_Task.cpp

@@ -40,7 +40,11 @@ void CALLBACK MessageQueue_CBTask_TimePublish(LPCTSTR lpszQueueName, __int64x nI
 		int nNetType = 0;
 		TCHAR tszUserAddr[128];
 		memset(tszUserAddr, '\0', sizeof(tszUserAddr));
-
+		//跳过自己
+		if (0 == _tcsncmp(st_DBInfo.tszUserName, ppSt_ListUser[i]->tszUserName, _tcslen(st_DBInfo.tszUserName)))
+		{
+			continue;
+		}
 		SessionModule_Client_GetAddr(ppSt_ListUser[i]->tszUserName, tszUserAddr);
 		SessionModule_Client_GetType(tszUserAddr, &nNetType);
 		ProtocolModule_Packet_Common(nNetType, &st_ProtocolHdr, &st_MQProtocol, tszMsgBuffer, &nMsgLen, st_DBInfo.tszMsgBuffer, st_DBInfo.nMsgLen);