From 7cac57d8678c58c794e497570f1d0ac13a8e7fab Mon Sep 17 00:00:00 2001
From: GUO <1923636941@qq.com>
Date: Wed, 1 May 2024 02:21:58 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basicdata/entity/BaseAuthority.java       | 21 +++++++++++--------
 .../mapper/xml/BaseAuthorityMapper.xml        |  9 ++++++--
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/BaseAuthority.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/BaseAuthority.java
index e52bd83a3..27c3d6e67 100644
--- a/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/BaseAuthority.java
+++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/BaseAuthority.java
@@ -1,16 +1,15 @@
 package com.zhgd.xmgl.modules.basicdata.entity;
 
-import java.io.Serializable;
-
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import lombok.Data;
-import org.jeecgframework.poi.excel.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+import java.io.Serializable;
 /**
  * @Description: 系统权限-菜单权限、操作权限
  * @author： pds
@@ -22,23 +21,27 @@ import io.swagger.annotations.ApiModelProperty;
 @ApiModel(value="BaseAuthority实体类",description="BaseAuthority")
 public class BaseAuthority implements Serializable {
     private static final long serialVersionUID = 1L;
-    
+
 	/**authorityId*/
     @TableId(type = IdType.ASSIGN_ID)
    @ApiModelProperty(value="authorityId")
 	private java.lang.Long authorityId  ;
 	/**菜单资源ID*/
 	@Excel(name = "菜单资源ID", width = 15)
-    
+
    @ApiModelProperty(value="菜单资源ID")
 	private java.lang.Long menuId  ;
 	/**操作ID*/
 	@Excel(name = "操作ID", width = 15)
    @ApiModelProperty(value="操作ID")
-    
+
 	private java.lang.Long actionId  ;
     /**状态:0-禁用 1-启用*/
     @Excel(name = "状态:0-禁用 1-启用", width = 15)
     @ApiModelProperty(value="状态:0-禁用 1-启用")
     private java.lang.Integer status  ;
+
+    @TableField(exist = false)
+    @ApiModelProperty("是否有下级列表")
+    private Boolean hasSubList;
 }
diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/BaseAuthorityMapper.xml b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/BaseAuthorityMapper.xml
index e3583ee74..2eeddda34 100644
--- a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/BaseAuthorityMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/BaseAuthorityMapper.xml
@@ -3,8 +3,13 @@
 <mapper namespace="com.zhgd.xmgl.modules.basicdata.mapper.BaseAuthorityMapper">
 
     <select id="getRoleAuthorityList" resultType="com.zhgd.xmgl.modules.basicdata.entity.BaseAuthority">
-        SELECT a.*
+        SELECT a.*,if(
+        (SELECT count(c.authority_id)
+        from base_action t
+        LEFT JOIN base_authority c ON t.action_id=c.action_id
+        where a.menu_id=t.menu_id)
+         > 0 ,1,0) hasSubList
         FROM base_authority a LEFT JOIN base_authority_role b ON a.authority_id=b.authority_id
         WHERE a.`status`=1 and b.role_id= #{roleId}
     </select>
-</mapper>
\ No newline at end of file
+</mapper>