From a8753cd48753549e78ca6540e5a36728c4daa51f Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Thu, 28 Jul 2022 11:23:40 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E5=8D=95=E6=8D=AE=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E7=8A=B6=E6=80=81=E6=9F=A5=E8=AF=A2=E6=97=A0=E6=95=88?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=202.=E4=BF=AE=E5=A4=8D=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=97=A0=E6=B3=95=E5=9B=9E=E6=98=BE=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/glxp/api/admin/util/PermissionRuleTreeUtils.java   | 1 +
 .../main/resources/mybatis/mapper/basic/BussinessTypeDao.xml    | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/api-admin/src/main/java/com/glxp/api/admin/util/PermissionRuleTreeUtils.java b/api-admin/src/main/java/com/glxp/api/admin/util/PermissionRuleTreeUtils.java
index bab16019..68eb1284 100644
--- a/api-admin/src/main/java/com/glxp/api/admin/util/PermissionRuleTreeUtils.java
+++ b/api-admin/src/main/java/com/glxp/api/admin/util/PermissionRuleTreeUtils.java
@@ -25,6 +25,7 @@ public class PermissionRuleTreeUtils {
             if (pid.equals(v.getPid())) {
                 authPermissionRuleMergeResponse.setChildren(merge(authPermissionRuleList, v.getId()));
                 authPermissionRuleMergeResponseList.add(authPermissionRuleMergeResponse);
+                authPermissionRuleMergeResponse.setStatus(v.getStatus().longValue());
             }
         }
 
diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml
index 93fecd69..a76a7cb3 100644
--- a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml
@@ -98,7 +98,7 @@
             <if test="mainAction != ''and mainAction != null">
                 AND mainAction LIKE concat(#{mainAction},'%')
             </if>
-            <if test="enabled != ''and enabled != null">
+            <if test="enabled != null">
                 AND basic_bussiness_type.enable =#{enabled}
             </if>
             <if test="advanceType != ''and advanceType != null">