From 013178aeb162e7e8012e32b4359a57c434cf69f3 Mon Sep 17 00:00:00 2001
From: cheney <1251790704@qq.com>
Date: Wed, 22 Mar 2023 11:18:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=AB=E6=8F=8F=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/huoran/iasf/service/impl/SysColumnServiceImpl.java | 2 +-
 .../com/huoran/iasf/service/impl/SysContentServiceImpl.java     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/huoran/iasf/service/impl/SysColumnServiceImpl.java b/src/main/java/com/huoran/iasf/service/impl/SysColumnServiceImpl.java
index b537063..7f909ca 100644
--- a/src/main/java/com/huoran/iasf/service/impl/SysColumnServiceImpl.java
+++ b/src/main/java/com/huoran/iasf/service/impl/SysColumnServiceImpl.java
@@ -95,7 +95,7 @@ public class SysColumnServiceImpl extends ServiceImpl<SysColumnMapper, SysColumn
 
         if(column.getRole()==null){
 
-        }else if (column.getRole()!=null&&column.getRole().equals("admin") || ObjectUtil.isNotNull(column.isIsadmin()) && column.isIsadmin()){
+        }else if (column.getRole()!=null||column.getRole().equals("admin") || ObjectUtil.isNotNull(column.isIsadmin()) || column.isIsadmin()){
             throw new IllegalArgumentException("参数名不能包含admin");
         }
         //查询所有栏目
diff --git a/src/main/java/com/huoran/iasf/service/impl/SysContentServiceImpl.java b/src/main/java/com/huoran/iasf/service/impl/SysContentServiceImpl.java
index c829d55..b7f4356 100644
--- a/src/main/java/com/huoran/iasf/service/impl/SysContentServiceImpl.java
+++ b/src/main/java/com/huoran/iasf/service/impl/SysContentServiceImpl.java
@@ -82,7 +82,7 @@ public class SysContentServiceImpl extends ServiceImpl<SysContentMapper, SysCont
     public R newlyPublishedArticles(PageContentReqVO reqVO) {
         if(reqVO.getRole()==null){
 
-        }else if (reqVO.getRole()!=null&&reqVO.getRole().equals("admin") || ObjectUtil.isNotNull(reqVO.isIsadmin()) && reqVO.isIsadmin()){
+        }else if (reqVO.getRole()!=null||reqVO.getRole().equals("admin") || ObjectUtil.isNotNull(reqVO.isIsadmin()) || reqVO.isIsadmin()){
             throw new IllegalArgumentException("参数名不能包含admin");
         }
         Page<PageContentRespVO> page = new Page<PageContentRespVO>(reqVO.getPageNum(), reqVO.getPageSize());