소스 검색

修改Bug

yandaniu 1 개월 전
부모
커밋
7fcf3ab86e
2개의 변경된 파일3개의 추가작업 그리고 4개의 파일을 삭제
  1. 2 3
      Ropin.Inspection.Api/Controllers/SYS/TsysMessageController.cs
  2. 1 1
      Ropin.Inspection.Repository/TmtnPushMsgResultRepository.cs

+ 2 - 3
Ropin.Inspection.Api/Controllers/SYS/TsysMessageController.cs

@@ -81,7 +81,7 @@ namespace Ropin.Inspection.Api.Controllers
             try
             {
                 var contentList = await _TsysMessageService.GetConditionAsync(searchModel);
-                return new ApiResult<IEnumerable<TsysMessageViewModel>>(contentList);
+                return new ApiResult<PagesModel<TsysMessageViewModel>>(new PagesModel<TsysMessageViewModel>(contentList, searchModel));
             }
             catch (Exception ex)
             {
@@ -101,11 +101,10 @@ namespace Ropin.Inspection.Api.Controllers
             {
                 return new ApiResult(ReturnCode.ArgsError);
             }
-            searchModel.IsPagination = false;
             try
             {
                 var contentList = await _TsysMessageService.GetConditionScreenAsync(searchModel);
-                return new ApiResult<IEnumerable<TsysMessageModel>>(contentList);
+                return new ApiResult<PagesModel<TsysMessageModel>>(new PagesModel<TsysMessageModel>(contentList, searchModel));
             }
             catch (Exception ex)
             {

+ 1 - 1
Ropin.Inspection.Repository/TmtnPushMsgResultRepository.cs

@@ -124,7 +124,7 @@ namespace Ropin.Inspection.Repository
                 new MySqlConnector.MySqlParameter("start ", searchModel.D_Start),
             };
             StringBuilder sql = new StringBuilder();
-            sql.Append($"select C_Content,D_CreateOn from SH_HB.TMTN_PushMsgResult  where C_Content like '%\"C_MsgTypeCode\":\"MSG_TYPE_011\",\"Subject\":\"设备开启关闭报警\"%' ");
+            sql.Append($"select C_Content,D_CreateOn from TMTN_PushMsgResult  where C_Content like '%\"C_MsgTypeCode\":\"MSG_TYPE_011\",\"Subject\":\"设备开启关闭报警\"%' ");
             if (!string.IsNullOrEmpty(searchModel.C_Content))
             {
                 sql.Append(" and C_Content like @name ");