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 @@
AND mainAction LIKE concat(#{mainAction},'%')
-
+
AND basic_bussiness_type.enable =#{enabled}