Parcourir la source

Merge remote-tracking branch 'origin/master'

syh il y a 5 ans
Parent
commit
b010b5eb3f

+ 2 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouCampaignTemplateController.java

@@ -76,10 +76,10 @@ public class KuaiShouCampaignTemplateController {
         Result<IPage<KuaiShouCampaignTemplate>> result = new Result<IPage<KuaiShouCampaignTemplate>>();
         QueryWrapper<KuaiShouCampaignTemplate> queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouCampaignTemplate, req.getParameterMap());
         LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        if(!Check.isNull(user)){
+        if (!Check.isNull(user)) {
             queryWrapper.eq("login_id", user.getId());
         }
-
+        queryWrapper.orderByDesc("id");
         Page<KuaiShouCampaignTemplate> page = new Page<KuaiShouCampaignTemplate>(pageNo, pageSize);
         IPage<KuaiShouCampaignTemplate> pageList = kuaiShouCampaignTemplateService.page(page, queryWrapper);
         result.setSuccess(true);

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouGroupCreateLogController.java

@@ -74,6 +74,7 @@ public class KuaiShouGroupCreateLogController {
                                                                HttpServletRequest req) {
         Result<IPage<KuaiShouGroupCreateLog>> result = new Result<IPage<KuaiShouGroupCreateLog>>();
         QueryWrapper<KuaiShouGroupCreateLog> queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouGroupCreateLog, req.getParameterMap());
+        queryWrapper.orderByDesc("id");
         LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         if (!Check.isNull(user)) {
             queryWrapper.eq("login_id", user.getId());
@@ -90,7 +91,6 @@ public class KuaiShouGroupCreateLogController {
      * 分页列表查询
      *
      * @param kuaiShouGroupCreateLog
-
      * @param req
      * @return
      */

+ 1 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouImageController.java

@@ -77,6 +77,7 @@ public class KuaiShouImageController {
         if (!Check.isNull(user)) {
             queryWrapper.eq("login_id", user.getId());
         }
+        queryWrapper.orderByDesc("id");
         Page<KuaiShouImage> page = new Page<KuaiShouImage>(pageNo, pageSize);
         IPage<KuaiShouImage> pageList = kuaiShouImageService.page(page, queryWrapper);
         result.setSuccess(true);

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouVideoController.java

@@ -119,7 +119,7 @@ public class KuaiShouVideoController {
             queryWrapper.eq("login_id", user.getId());
         }
         queryWrapper.eq("status", 1);
-        queryWrapper.orderByDesc("create_time");
+        queryWrapper.orderByDesc("id");
         Page<KuaiShouVideo> page = new Page<KuaiShouVideo>(pageNo, pageSize);
         IPage<KuaiShouVideo> pageList = kuaiShouVideoService.page(page, queryWrapper);
         result.setSuccess(true);