|
@@ -29,7 +29,7 @@ namespace OASystem.Infrastructure.Repositories.Resource
|
|
|
|
|
|
public async Task<JsonView> QueryOfficialActivitiesByDiId(OfficialActivitiesByDiIdDto dto)
|
|
|
{
|
|
|
- JsonView result = new JsonView() { Code = StatusCodes.Status204NoContent, Msg = "未知错误" };
|
|
|
+ JsonView result = new JsonView() { Code = StatusCodes.Status200OK, Msg = "暂无数据" };
|
|
|
|
|
|
string sqlWhere = string.Empty;
|
|
|
sqlWhere += string.Format(@"AND o.Isdel={0} AND o.DiId={1} ", 0, dto.DiId);
|
|
@@ -56,7 +56,6 @@ ORDER BY
|
|
|
|
|
|
if (OfficialActivities.Count != 0)
|
|
|
{
|
|
|
-
|
|
|
if (dto.PageSize == 0 && dto.PageIndex == 0)
|
|
|
{
|
|
|
foreach (var temp in OfficialActivities)
|
|
@@ -114,10 +113,10 @@ ORDER BY
|
|
|
result = new JsonView() { Code = 200, Msg = "查询成功!", Data = rst };
|
|
|
}
|
|
|
}
|
|
|
- else
|
|
|
- {
|
|
|
- result = new JsonView() { Code = StatusCodes.Status204NoContent, Msg = "暂无数据!", Data = OfficialActivities };
|
|
|
- }
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
|
|
|
return result;
|
|
|
}
|