admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug修复

Browse Source
This commit is contained in:
GUO 2024-05-01 02:21:58 +08:00
parent 936cbb091a
commit 7cac57d867
2 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/main/java/com/zhgd/xmgl/modules/basicdata/entity/BaseAuthority.java
View File

@ -1,16 +1,15 @@
package com.zhgd.xmgl.modules.basicdata.entity; package com.zhgd.xmgl.modules.basicdata.entity;
import java.io.Serializable;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; 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.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.jeecgframework.poi.excel.annotation.Excel;
import java.io.Serializable;
/** /**
* @Description: 系统权限-菜单权限、操作权限 * @Description: 系统权限-菜单权限、操作权限
* @author： pds * @author： pds
@ -22,23 +21,27 @@ import io.swagger.annotations.ApiModelProperty;
@ApiModel(value="BaseAuthority实体类",description="BaseAuthority") @ApiModel(value="BaseAuthority实体类",description="BaseAuthority")
public class BaseAuthority implements Serializable { public class BaseAuthority implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/**authorityId*/ /**authorityId*/
@TableId(type = IdType.ASSIGN_ID) @TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value="authorityId") @ApiModelProperty(value="authorityId")
private java.lang.Long authorityId ; private java.lang.Long authorityId ;
/**菜单资源ID*/ /**菜单资源ID*/
@Excel(name = "菜单资源ID", width = 15) @Excel(name = "菜单资源ID", width = 15)
@ApiModelProperty(value="菜单资源ID") @ApiModelProperty(value="菜单资源ID")
private java.lang.Long menuId ; private java.lang.Long menuId ;
/**操作ID*/ /**操作ID*/
@Excel(name = "操作ID", width = 15) @Excel(name = "操作ID", width = 15)
@ApiModelProperty(value="操作ID") @ApiModelProperty(value="操作ID")
private java.lang.Long actionId ; private java.lang.Long actionId ;
/**状态:0-禁用 1-启用*/ /**状态:0-禁用 1-启用*/
@Excel(name = "状态:0-禁用 1-启用", width = 15) @Excel(name = "状态:0-禁用 1-启用", width = 15)
@ApiModelProperty(value="状态:0-禁用 1-启用") @ApiModelProperty(value="状态:0-禁用 1-启用")
private java.lang.Integer status ; private java.lang.Integer status ;
@TableField(exist = false)
@ApiModelProperty("是否有下级列表")
private Boolean hasSubList;
} }

9
src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/BaseAuthorityMapper.xml
View File

@ -3,8 +3,13 @@
<mapper namespace="com.zhgd.xmgl.modules.basicdata.mapper.BaseAuthorityMapper"> <mapper namespace="com.zhgd.xmgl.modules.basicdata.mapper.BaseAuthorityMapper">
<select id="getRoleAuthorityList" resultType="com.zhgd.xmgl.modules.basicdata.entity.BaseAuthority"> <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 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} WHERE a.`status`=1 and b.role_id= #{roleId}
</select> </select>
</mapper> </mapper>