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 0170cd0c..3f2bd21b 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 @@ -7,7 +7,7 @@ import lombok.Data; import java.io.Serializable; -@TableName("mgr_role_org") +@TableName("sys_role_dept") @ApiModel("角色组织表") @Data public class MgrRoleOrg implements Serializable { @@ -16,8 +16,8 @@ public class MgrRoleOrg implements Serializable { private Long roleId; @ApiModelProperty("组织ID") private Long orgId; - @ApiModelProperty("节点状态:1全选;2半选") - private Integer halfSelect; +// @ApiModelProperty("节点状态:1全选;2半选") +// private Integer halfSelect; public Long getRoleId() { return this.roleId; @@ -27,9 +27,9 @@ public class MgrRoleOrg implements Serializable { return this.orgId; } - public Integer getHalfSelect() { - return this.halfSelect; - } +// public Integer getHalfSelect() { +// return this.halfSelect; +// } public MgrRoleOrg setRoleId(final Long roleId) { this.roleId = roleId; @@ -41,12 +41,9 @@ public class MgrRoleOrg implements Serializable { return this; } - public MgrRoleOrg setHalfSelect(final Integer halfSelect) { - this.halfSelect = halfSelect; - return this; - } - - - +// public MgrRoleOrg setHalfSelect(final Integer halfSelect) { +// this.halfSelect = halfSelect; +// return this; +// } } diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/order/OrdAppInfoMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/order/OrdAppInfoMapper.xml index df511a64..165bcaa1 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/order/OrdAppInfoMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/order/OrdAppInfoMapper.xml @@ -246,14 +246,14 @@ and EXISTS ( SELECT null - FROM mgr_role_org it1 + FROM sys_role_dept 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 ci.dept_id = it1.org_id + AND ci.dept_id = it1.dept_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 7cfb7996..e484e60f 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 @@ -6,14 +6,14 @@ and EXISTS ( SELECT null - FROM mgr_role_org it1 + FROM sys_role_dept 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 a.org_id = it1.org_id + AND a.org_id = it1.dept_id ) @@ -114,14 +114,14 @@ and EXISTS ( SELECT null - FROM mgr_role_org it1 + FROM sys_role_dept 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 o.org_id = it1.org_id + AND o.org_id = it1.dept_id ) diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/role/MgrRoleOrgMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/role/MgrRoleOrgMapper.xml index 72d5b8c2..2043d958 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/role/MgrRoleOrgMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/role/MgrRoleOrgMapper.xml @@ -2,10 +2,10 @@ - insert into mgr_role_org + insert into sys_role_dept values - (#{roleId}, #{org.orgId}, #{org.halfSelect}) + (#{roleId}, #{org.orgId}) @@ -96,9 +96,9 @@