|
@@ -328,6 +328,8 @@ namespace GxPress.Repository.Implement
|
|
sb += " and a.NoticeAddresseeType=2 AND a.AttributeValue=1 AND a.IsDelete = 0";
|
|
sb += " and a.NoticeAddresseeType=2 AND a.AttributeValue=1 AND a.IsDelete = 0";
|
|
else if (request.SearchType == 3)
|
|
else if (request.SearchType == 3)
|
|
sb += " AND a.IsDelete = 1 AND a.AttributeValue=1";
|
|
sb += " AND a.IsDelete = 1 AND a.AttributeValue=1";
|
|
|
|
+ else if (request.SearchType > 3)
|
|
|
|
+ sb += $" AND b.TypeValue={request.SearchType}";
|
|
else
|
|
else
|
|
sb += " AND a.IsDelete = 0 AND a.NoticeAddresseeType != 2";
|
|
sb += " AND a.IsDelete = 0 AND a.NoticeAddresseeType != 2";
|
|
if (!string.IsNullOrEmpty(request.Keyword))
|
|
if (!string.IsNullOrEmpty(request.Keyword))
|
|
@@ -470,7 +472,7 @@ namespace GxPress.Repository.Implement
|
|
tede_addressee d ON d.Id = a.MiddleSonId
|
|
tede_addressee d ON d.Id = a.MiddleSonId
|
|
WHERE
|
|
WHERE
|
|
a.UserId = {1} and a.FolderType={2}
|
|
a.UserId = {1} and a.FolderType={2}
|
|
- {0}", sb, request.UserId,noticeTypeValue);
|
|
|
|
|
|
+ {0}", sb, request.UserId, noticeTypeValue);
|
|
var databaseType = StringUtils.ToEnum<DatabaseType>(_databaseTypeStr, DatabaseType.MySql);
|
|
var databaseType = StringUtils.ToEnum<DatabaseType>(_databaseTypeStr, DatabaseType.MySql);
|
|
var database = new Database(databaseType, _connectionString);
|
|
var database = new Database(databaseType, _connectionString);
|
|
var connection = database.GetConnection();
|
|
var connection = database.GetConnection();
|
|
@@ -479,7 +481,7 @@ namespace GxPress.Repository.Implement
|
|
(noticeListPageResult, notice, user, noticeAddressee) =>
|
|
(noticeListPageResult, notice, user, noticeAddressee) =>
|
|
{
|
|
{
|
|
noticeListPageResult.Title = notice != null ? notice.Title : "";
|
|
noticeListPageResult.Title = notice != null ? notice.Title : "";
|
|
- noticeListPageResult.TypeValue=notice != null ? notice.TypeValue :0;
|
|
|
|
|
|
+ noticeListPageResult.TypeValue = notice != null ? notice.TypeValue : 0;
|
|
noticeListPageResult.Content = notice != null ? notice.Content : "[]";
|
|
noticeListPageResult.Content = notice != null ? notice.Content : "[]";
|
|
noticeListPageResult.UserName = user != null ? user.Name : "";
|
|
noticeListPageResult.UserName = user != null ? user.Name : "";
|
|
noticeListPageResult.SourceId = notice != null ? notice.SourceId : 0;
|
|
noticeListPageResult.SourceId = notice != null ? notice.SourceId : 0;
|