替换 mgr_role_org 表为 sys_role_dept

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半选")
+//   @ApiModelProperty("节点状态：1全选；2半选")
-   private Integer halfSelect;
+//   private Integer halfSelect;
 
    public Long getRoleId() {
       return this.roleId;
@@ -27,9 +27,9 @@ public class MgrRoleOrg implements Serializable {
       return this.orgId;
    }
 
-   public Integer getHalfSelect() {
+//   public Integer getHalfSelect() {
-      return this.halfSelect;
+//      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) {
+//   public MgrRoleOrg setHalfSelect(final Integer halfSelect) {
-      this.halfSelect = halfSelect;
+//      this.halfSelect = halfSelect;
-      return this;
+//      return this;
-   }
+//   }
-
-
-
 
 }

bonus-modules/bonus-smart-canteen/src/main/resources/mapper/order/OrdAppInfoMapper.xml

@@ -246,14 +246,14 @@
             <if test="'2'.toString() == authPO.roleType.toString()">
                 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
                 )
             </if>
             <if test="'3'.toString() == authPO.roleType.toString()">

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

@@ -6,14 +6,14 @@
         <if test="'2'.toString() == authPO.roleType.toString()">
             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
             )
         </if>
         <if test="'3'.toString() == authPO.roleType.toString()">
@@ -114,14 +114,14 @@
             <if test="'2'.toString() == authPO.roleType.toString()">
                 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
                 )
             </if>
             <if test="'3'.toString() == authPO.roleType.toString()">

bonus-modules/bonus-smart-canteen/src/main/resources/mapper/role/MgrRoleOrgMapper.xml

@@ -2,10 +2,10 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.bonus.canteen.core.auth.role.mapper.MgrRoleOrgMapper">
     <insert id="insertBatch" parameterType="object">
-        insert into mgr_role_org
+        insert into sys_role_dept
         values
         <foreach collection="orgList" item="org" index="index" separator=",">
-            (#{roleId}, #{org.orgId}, #{org.halfSelect})
+            (#{roleId}, #{org.orgId})
         </foreach>
     </insert>
 
@@ -96,9 +96,9 @@
 
     <select id="getRoleListByOrgId" resultType="com.bonus.canteen.core.auth.role.entity.MgrRole">
         SELECT mro.role_id
-        FROM mgr_role_org mro
+        FROM sys_role_dept mro
-        WHERE mro.org_id = #{orgId}
+        WHERE mro.dept_id = #{orgId}
-          AND mro.half_select = #{excludeMiddle}
+#           AND mro.half_select = #{excludeMiddle}
         <if test="roleId != null">
             AND mro.role_id != #{roleId}
         </if>

bonus-modules/bonus-smart-canteen/src/main/resources/mapper/v3/AccInfoMapper.xml

@@ -600,14 +600,14 @@
         <if test="'1'.toString() != authPO.roleType.toString()">
             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 it1.org_id = ci.dept_id
+            AND it1.dept_id = ci.dept_id
             )
         </if>
     </sql>