From f308b98ce42b406030fec3e2d39349cb3344d6ee Mon Sep 17 00:00:00 2001
From: wangxiang <1827945911@qq.com>
Date: Thu, 20 Apr 2023 20:02:49 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=BC=81=E4=B8=9A?=
 =?UTF-8?q?=E6=8E=A8=E9=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../kicc/commonbiz/controller/PushApplicationController.java   | 2 +-
 .../commonbiz/service/impl/PushApplicationServiceImpl.java     | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/PushApplicationController.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/PushApplicationController.java
index 63175be7..ed8a4a0e 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/PushApplicationController.java
+++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/PushApplicationController.java
@@ -47,7 +47,7 @@ public class PushApplicationController {
                 .eq(PushApplication::getCreateById, SecurityUtils.getUser().getId())
                 .eq(StrUtil.isNotBlank(pushApplication.getName()), PushApplication::getName, pushApplication.getName())
                 .eq(StrUtil.isNotBlank(pushApplication.getStatus()), PushApplication::getStatus, pushApplication.getStatus())
-                .orderByDesc(PushApplication::getCreateTime);
+                .orderByAsc(PushApplication::getCreateTime);
     }
 
     @ApiOperation("分页查询")
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/PushApplicationServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/PushApplicationServiceImpl.java
index f0a14f02..32cb5a94 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/PushApplicationServiceImpl.java
+++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/PushApplicationServiceImpl.java
@@ -90,7 +90,8 @@ public class PushApplicationServiceImpl extends ServiceImpl<PushApplicationMappe
         SecurityContextHolder.getContext().setAuthentication(authentication);
 
         // todo: // 待处理需要使用枚举规范用户类型参数，不好维护
-        if (!StrUtil.equals(SecurityUtils.getUser().getUserType(), "2") || !StrUtil.equals(SecurityUtils.getUser().getUserType(), "5")) {
+        if (!StrUtil.equals(SecurityUtils.getUser().getUserType(), "2") &&
+            !StrUtil.equals(SecurityUtils.getUser().getUserType(), "5")) {
             throw new CheckedException("当前用户不是企业用户，禁止操作！");
         }