测试bug修改

enterprise-manager/src/main/java/com/mortals/xhx/base/system/user/model/vo/UserVo.java

@@ -39,4 +39,6 @@ public class UserVo extends BaseEntityLong {
      * 过期时间
      */
     private Long expireTime;
+    /** 用户类型，0：系统用户 1:普通用户 2:工作人员，默认2列表 */
+    private List <Integer> userTypeList;
 }
\ No newline at end of file

enterprise-manager/src/main/java/com/mortals/xhx/busiz/applets/web/NewsApiController.java

@@ -111,7 +111,7 @@ public class NewsApiController extends AbstractBaseController<NewsReq> {
                query.setCategoryId(newsReq.getNewsCategoryId());
             }
 
-            query.setOrderColList(Arrays.asList(new OrderCol("createTime", OrderCol.DESCENDING)));
+            query.setOrderColList(Arrays.asList(new OrderCol("top", OrderCol.DESCENDING),new OrderCol("createTime", OrderCol.DESCENDING)));
             Result<NewsEntity> result = newsService.find(query, pageInfo, context);
             result.getList().forEach(item->{
                 item.setContent(null);

enterprise-manager/src/main/java/com/mortals/xhx/module/news/web/NewsController.java

@@ -2,6 +2,9 @@ package com.mortals.xhx.module.news.web;
 
 import com.mortals.framework.common.Rest;
 import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.OrderCol;
+import com.mortals.framework.model.PageInfo;
+import com.mortals.framework.model.Result;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
 import com.mortals.xhx.base.system.user.model.UserQuery;
@@ -144,4 +147,9 @@ public class NewsController extends BaseCRUDJsonBodyMappingController<NewsServic
         }
         return rest;
     }
+
+    @Override
+    protected void doListBefore(NewsEntity query, Map<String, Object> model, Context context) throws AppException {
+        query.setOrderColList(Arrays.asList(new OrderCol("top", OrderCol.DESCENDING),new OrderCol("createTime", OrderCol.DESCENDING)));
+    }
 }
\ No newline at end of file