From 31b5076320f7b35b106568be2bb7ee2ec1ad37ff Mon Sep 17 00:00:00 2001 From: gaowdong Date: Fri, 14 Mar 2025 11:17:41 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=BF=E6=8D=A2=20mgr=5Frole=5Farea=20?= =?UTF-8?q?=E8=A1=A8=E4=B8=BA=20sys=5Frole=5Farea?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/auth/role/entity/MgrRoleArea.java | 23 +++++++++++-------- .../core/auth/role/entity/MgrRoleOrg.java | 2 ++ .../mapper/alloc/AllocAreaMapper.xml | 4 ++-- .../mapper/order/ReportSumMachineMapper.xml | 12 +++++----- .../report/ReportAnalysisDishesSaleMapper.xml | 6 ++--- .../mapper/role/MgrRoleAreaMapper.xml | 20 ++++++++-------- 6 files changed, 36 insertions(+), 31 deletions(-) diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/auth/role/entity/MgrRoleArea.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/auth/role/entity/MgrRoleArea.java index 8d9c93c1..b0d8c13d 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/auth/role/entity/MgrRoleArea.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/auth/role/entity/MgrRoleArea.java @@ -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; +// } } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/auth/role/entity/MgrRoleOrg.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/auth/role/entity/MgrRoleOrg.java index 3f2bd21b..062d8770 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/auth/role/entity/MgrRoleOrg.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/auth/role/entity/MgrRoleOrg.java @@ -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; diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/alloc/AllocAreaMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/alloc/AllocAreaMapper.xml index 9836c03f..9be9b051 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/alloc/AllocAreaMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/alloc/AllocAreaMapper.xml @@ -64,13 +64,13 @@ 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 ) diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/order/ReportSumMachineMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/order/ReportSumMachineMapper.xml index e484e60f..4a15a942 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/order/ReportSumMachineMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/order/ReportSumMachineMapper.xml @@ -45,14 +45,14 @@ 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 ) @@ -159,14 +159,14 @@ 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 ) diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/report/ReportAnalysisDishesSaleMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/report/ReportAnalysisDishesSaleMapper.xml index 9284cfab..d6d03467 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/report/ReportAnalysisDishesSaleMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/report/ReportAnalysisDishesSaleMapper.xml @@ -38,14 +38,14 @@ 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 ) diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/role/MgrRoleAreaMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/role/MgrRoleAreaMapper.xml index b54db6f5..8765a96e 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/role/MgrRoleAreaMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/role/MgrRoleAreaMapper.xml @@ -4,31 +4,31 @@ - insert into mgr_role_area + insert into sys_role_area values - (#{roleId}, #{area.dataId}, #{area.halfSelect}) + (#{roleId}, #{area.dataId})