bonus
/
Bonus-Cloud-Houqin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

替换 mgr_role_area 表为 sys_role_area

This commit is contained in:
gaowdong 2025-03-14 11:17:41 +08:00
parent 9c6ca487f0
commit 31b5076320
6 changed files with 36 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/auth/role/entity/MgrRoleArea.java
View File

@ -1,18 +1,21 @@
package com.bonus.canteen.core.auth.role.entity;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@TableName("mgr_role_area")
@TableName("sys_role_area")
@ApiModel("角色区域表")
public class MgrRoleArea {
@ApiModelProperty("角色ID")
private Long roleId;
@ApiModelProperty("区域、食堂、档口ID")
@TableField(value = "area_id")
private Long dataId;
@ApiModelProperty("节点状态：1全选；2半选")
private Integer halfSelect;
// @ApiModelProperty("节点状态：1全选；2半选")
// private Integer halfSelect;
public Long getRoleId() {
return this.roleId;
@ -22,9 +25,9 @@ public class MgrRoleArea {
return this.dataId;
}
public Integer getHalfSelect() {
return this.halfSelect;
}
// public Integer getHalfSelect() {
// return this.halfSelect;
// }
public MgrRoleArea setRoleId(final Long roleId) {
this.roleId = roleId;
@ -36,8 +39,8 @@ public class MgrRoleArea {
return this;
}
public MgrRoleArea setHalfSelect(final Integer halfSelect) {
this.halfSelect = halfSelect;
return this;
}
// public MgrRoleArea setHalfSelect(final Integer halfSelect) {
// this.halfSelect = halfSelect;
// return this;
// }
}

2
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/auth/role/entity/MgrRoleOrg.java
View File

@ -1,5 +1,6 @@
package com.bonus.canteen.core.auth.role.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@ -15,6 +16,7 @@ public class MgrRoleOrg implements Serializable {
@ApiModelProperty("角色ID")
private Long roleId;
@ApiModelProperty("组织ID")
@TableField(value = "dept_id")
private Long orgId;
// @ApiModelProperty("节点状态：1全选；2半选")
// private Integer halfSelect;

4
bonus-modules/bonus-smart-canteen/src/main/resources/mapper/alloc/AllocAreaMapper.xml
View File

@ -64,13 +64,13 @@
<if test="'-1'.toString() != authPO.roleType.toString()">
and EXISTS (
SELECT null
FROM mgr_role_area it1
FROM sys_role_area it1
LEFT JOIN sys_role it2 ON it2.role_id = it1.role_id
LEFT JOIN sys_user_role it3 ON it1.role_id = it3.role_id
WHERE it2.del_flag = 0
AND it2.role_key = #{authPO.roleCode}
AND it3.user_id = #{authPO.userId}
AND t1.area_id = it1.data_id
AND t1.area_id = it1.area_id
)
</if>
</select>

12
bonus-modules/bonus-smart-canteen/src/main/resources/mapper/order/ReportSumMachineMapper.xml
View File

@ -45,14 +45,14 @@
<if test="'2'.toString() == authPO.roleType.toString() or '1'.toString() == authPO.roleType.toString()">
and EXISTS (
SELECT null
FROM mgr_role_area it1
FROM sys_role_area it1
LEFT JOIN sys_role it2 ON it2.role_id = it1.role_id
LEFT JOIN sys_user_role it3 ON it1.role_id = it3.role_id
WHERE it2.del_flag = 0
AND it2.role_key = #{authPO.roleCode}
AND it1.half_select = 1
# AND it1.half_select = 1
AND it3.user_id = #{authPO.userId}
AND c.area_id = it1.data_id
AND c.area_id = it1.area_id
)
</if>
</sql>
@ -159,14 +159,14 @@
<if test="'2'.toString() == authPO.roleType.toString() or '1'.toString() == authPO.roleType.toString()">
and EXISTS (
SELECT null
FROM mgr_role_area it1
FROM sys_role_area it1
LEFT JOIN sys_role it2 ON it2.role_id = it1.role_id
LEFT JOIN sys_user_role it3 ON it1.role_id = it3.role_id
WHERE it2.del_flag = 0
AND it2.role_key = #{authPO.roleCode}
AND it1.half_select = 1
# AND it1.half_select = 1
AND it3.user_id = #{authPO.userId}
AND c.area_id = it1.data_id
AND c.area_id = it1.area_id
)
</if>
</where>

6
bonus-modules/bonus-smart-canteen/src/main/resources/mapper/report/ReportAnalysisDishesSaleMapper.xml
View File

@ -38,14 +38,14 @@
<if test="'2'.toString() == authPO.roleType.toString() or '1'.toString() == authPO.roleType.toString()">
and EXISTS (
SELECT null
FROM mgr_role_area it1
FROM sys_role_area it1
LEFT JOIN sys_role it2 ON it2.role_id = it1.role_id
LEFT JOIN sys_user_role it3 ON it1.role_id = it3.role_id
WHERE it2.del_flag = 0
AND it2.role_key = #{authPO.roleCode}
AND it1.half_select = 1
# AND it1.half_select = 1
AND it3.user_id = #{authPO.userId}
AND ac.area_id = it1.data_id
AND ac.area_id = it1.area_id
)
</if>
</sql>

20
bonus-modules/bonus-smart-canteen/src/main/resources/mapper/role/MgrRoleAreaMapper.xml
View File

@ -4,31 +4,31 @@
<mapper namespace="com.bonus.canteen.core.auth.role.mapper.MgrRoleAreaMapper">
<select id="getTenantAreaIdList" resultType="java.lang.Long">
SELECT r.data_id
FROM mgr_role_area r
SELECT r.area_id
FROM sys_role_area r
LEFT JOIN sys_role o ON o.role_id = r.role_id
LEFT JOIN sys_user_role u ON r.role_id = u.role_id
WHERE u.user_id = #{authPO.userId}
AND o.role_key = #{authPO.roleCode}
AND o.del_flag = 0
<if test="excludeMiddle == 1">
AND r.half_select = 1
</if>
<!-- <if test="excludeMiddle == 1">-->
<!-- AND r.half_select = 1-->
<!-- </if>-->
</select>
<insert id="insertBatch">
insert into mgr_role_area
insert into sys_role_area
values
<foreach collection="areaList" item="area" index="index" separator=",">
(#{roleId}, #{area.dataId}, #{area.halfSelect})
(#{roleId}, #{area.dataId})
</foreach>
</insert>
<select id="getRoleListByDataId" resultType="com.bonus.canteen.core.auth.role.entity.MgrRole">
SELECT mra.role_id
FROM mgr_role_area mra
WHERE mra.data_id = #{dataId}
AND mra.half_select = #{excludeMiddle}
FROM sys_role_area mra
WHERE mra.area_id = #{dataId}
# AND mra.half_select = #{excludeMiddle}
<if test="roleIdList != null and roleIdList.size() != 0">
AND mra.role_id NOT IN
<foreach collection="roleIdList" item="roleId" index="index" open="(" close=")" separator=",">