Merge branch 'test'

pro-base/src/main/java/com/idea/message/controller/MessageWorkController.java

@@ -41,8 +41,8 @@ public class MessageWorkController extends BaseController {
     // 获取所有系统消息
     @PostMapping(value = "getAllList",produces = {"application/json;charset=UTF-8"})
     @ResponseBody
-    public Object getAllList(Tablepar tablepar){
-        PageInfo<SysMessageInfo> page = sysMessageInfoService.list(tablepar, new SysMessageInfo(), new DateTrans());
+    public Object getAllList(Tablepar tablepar,SysMessageInfo model){
+        PageInfo<SysMessageInfo> page = sysMessageInfoService.list(tablepar, model, new DateTrans());
         TableSplitResult<SysMessageInfo> result = new TableSplitResult<SysMessageInfo>(page.getPageNum(), page.getTotal(), page.getList());
         return  result;
     }

pro-base/src/main/java/com/idea/message/service/MessageInfoService.java

@@ -129,7 +129,9 @@ public class MessageInfoService implements BaseService<SysMessageInfo, SysMessag
         }
         ex.setOrderByClause("create_time desc");
         SysMessageInfoExample.Criteria criteria = ex.createCriteria();
-
+        if(StringUtils.isNotEmpty(model.getState())){
+            criteria.andStateEqualTo(model.getState());
+        }
 
         return ex;
     }