publish 2.0.0.rc32

springboot-role/src/main/resources/mapper/CoreRoleUserMapper.xml

@@ -54,6 +54,9 @@
                and cru.user_id = #{userId}
                and cru.is_deleted = 0
                and (cru.expire_time is null or cru.expire_time > now())
+                <if test="type != null and type != ''">
+                    and crgr.type=#{type}
+                </if>
 
       <if test="roleId != null and roleId != ''">
           union
@@ -61,6 +64,9 @@
           select menu_id
           from core_role_group_rx
           where group_id = #{roleId}
+          <if test="type != null and type != ''">
+              and type=#{type}
+          </if>
       </if>
       )
       order by sort