From b0f151bb4023d00b14ebdbca8f0b6984b4236cc8 Mon Sep 17 00:00:00 2001
From: sanluan <master@publiccms.com>
Date: Mon, 4 Jan 2021 11:01:08 +0800
Subject: [PATCH] =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=80=BB=E8=BE=91=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/admin/common/content_list.html         | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/publiccms-parent/publiccms/src/main/resources/templates/admin/common/content_list.html b/publiccms-parent/publiccms/src/main/resources/templates/admin/common/content_list.html
index d61b186e..d4dc2508 100644
--- a/publiccms-parent/publiccms/src/main/resources/templates/admin/common/content_list.html
+++ b/publiccms-parent/publiccms/src/main/resources/templates/admin/common/content_list.html
@@ -4,14 +4,8 @@
         containChild=object.ownsAllCategory
     />
 </@_sysDept>
-<@_sysDeptCategory deptId=admin.deptId!'' categoryId=categoryId!><#assign deptCategory=object!/></@_sysDeptCategory>
-<#if !dept?has_content||(!dept.ownsAllCategory&&!deptCategory?has_content)>
-    <#if categoryId?has_content>
-        <div class="pageContent"><@t.message 'verify.notEquals.siteId'/></div>
-    <#else>
-        <div class="pageContent"></div>
-    </#if>
-<#else>
+<@_sysDeptCategory deptId=admin.deptId!'' categoryId=categoryId!''><#assign deptCategory=object!/></@_sysDeptCategory>
+<#if deptCategory?has_content&&deptCategory>
     <#if parentId?has_content>
         <@_content id=parentId><#assign parent=object/></@_content>
     </#if>
@@ -231,4 +225,6 @@
     <#include "../include_page/page.html"/>
 </div>
 </@_contentList>
+<#else>
+    <div class="pageContent"><#if categoryId?has_content><@t.message 'verify.notEquals.siteId'/></#if></div>
 </#if>
\ No newline at end of file
-- 
GitLab