From aec8961ddc23d3fb79d9f7a403c80f79b3db0788 Mon Sep 17 00:00:00 2001
From: smallchill <smallchill@163.com>
Date: Mon, 24 Jun 2019 01:18:10 +0800
Subject: [PATCH] :tada: 2.0.4.RELEASE

---
 .../java/org/springblade/system/feign/DictClient.java  |  1 +
 .../java/org/springblade/system/mapper/MenuMapper.xml  |  2 +-
 .../org/springblade/system/mapper/RoleScopeMapper.xml  |  2 +-
 doc/sql/bladex-datascope-update.sql                    | 10 +++++-----
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/feign/DictClient.java b/blade-service/blade-system/src/main/java/org/springblade/system/feign/DictClient.java
index ced4a016..67854cb8 100644
--- a/blade-service/blade-system/src/main/java/org/springblade/system/feign/DictClient.java
+++ b/blade-service/blade-system/src/main/java/org/springblade/system/feign/DictClient.java
@@ -41,6 +41,7 @@ public class DictClient implements IDictClient {
 	private IDictService service;
 
 	@Override
+	@GetMapping(GET_BY_ID)
 	public R<Dict> getById(Long id) {
 		return R.data(service.getById(id));
 	}
diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/MenuMapper.xml b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/MenuMapper.xml
index 98bd3069..2b62ee43 100644
--- a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/MenuMapper.xml
+++ b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/MenuMapper.xml
@@ -222,7 +222,7 @@
           AND menu_id IS NOT NULL
     </select>
 
-    <select id="authRoutes" resultType="org.springblade.modules.system.dto.MenuDTO">
+    <select id="authRoutes" resultType="org.springblade.system.dto.MenuDTO">
         SELECT
             GROUP_CONCAT(r.role_alias) as alias,
             m.path
diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/RoleScopeMapper.xml b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/RoleScopeMapper.xml
index c6a0f0d7..55b8fb51 100644
--- a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/RoleScopeMapper.xml
+++ b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/RoleScopeMapper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.springblade.modules.system.mapper.RoleScopeMapper">
+<mapper namespace="org.springblade.system.mapper.RoleScopeMapper">
 
     <!-- 通用查询映射结果 -->
     <resultMap id="roleMenuResultMap" type="org.springblade.system.entity.RoleScope">
diff --git a/doc/sql/bladex-datascope-update.sql b/doc/sql/bladex-datascope-update.sql
index 7a938fdf..a8c70a2d 100644
--- a/doc/sql/bladex-datascope-update.sql
+++ b/doc/sql/bladex-datascope-update.sql
@@ -72,11 +72,11 @@ INSERT INTO `blade_dict`(`id`, `parent_id`, `code`, `dict_key`, `dict_value`, `s
 INSERT INTO `blade_dict`(`id`, `parent_id`, `code`, `dict_key`, `dict_value`, `sort`, `remark`, `is_deleted`) VALUES (1123598814738675229, 1123598814738675227, 'org_category', 2, '部门', 2, NULL, 0);
 INSERT INTO `blade_dict`(`id`, `parent_id`, `code`, `dict_key`, `dict_value`, `sort`, `remark`, `is_deleted`) VALUES (1123598814738675230, 1123598814738675227, 'org_category', 3, '小组', 3, NULL, 0);
 INSERT INTO `blade_dict`(`id`, `parent_id`, `code`, `dict_key`, `dict_value`, `sort`, `remark`, `is_deleted`) VALUES (1123598814738675231, 0, 'scope_type', -1, '数据权限', 8, NULL, 0);
-INSERT INTO `blade_dict`(`id`, `parent_id`, `code`, `dict_key`, `dict_value`, `sort`, `remark`, `is_deleted`) VALUES (1123598814738675232, 1123598814738675230, 'scope_type', 1, '全部可见', 1, NULL, 0);
-INSERT INTO `blade_dict`(`id`, `parent_id`, `code`, `dict_key`, `dict_value`, `sort`, `remark`, `is_deleted`) VALUES (1123598814738675233, 1123598814738675230, 'scope_type', 2, '本人可见', 2, NULL, 0);
-INSERT INTO `blade_dict`(`id`, `parent_id`, `code`, `dict_key`, `dict_value`, `sort`, `remark`, `is_deleted`) VALUES (1123598814738675234, 1123598814738675230, 'scope_type', 3, '所在机构可见', 3, NULL, 0);
-INSERT INTO `blade_dict`(`id`, `parent_id`, `code`, `dict_key`, `dict_value`, `sort`, `remark`, `is_deleted`) VALUES (1123598814738675235, 1123598814738675230, 'scope_type', 4, '所在机构及子级可见', 4, NULL, 0);
-INSERT INTO `blade_dict`(`id`, `parent_id`, `code`, `dict_key`, `dict_value`, `sort`, `remark`, `is_deleted`) VALUES (1123598814738675236, 1123598814738675230, 'scope_type', 5, '自定义', 5, NULL, 0);
+INSERT INTO `blade_dict`(`id`, `parent_id`, `code`, `dict_key`, `dict_value`, `sort`, `remark`, `is_deleted`) VALUES (1123598814738675232, 1123598814738675231, 'scope_type', 1, '全部可见', 1, NULL, 0);
+INSERT INTO `blade_dict`(`id`, `parent_id`, `code`, `dict_key`, `dict_value`, `sort`, `remark`, `is_deleted`) VALUES (1123598814738675233, 1123598814738675231, 'scope_type', 2, '本人可见', 2, NULL, 0);
+INSERT INTO `blade_dict`(`id`, `parent_id`, `code`, `dict_key`, `dict_value`, `sort`, `remark`, `is_deleted`) VALUES (1123598814738675234, 1123598814738675231, 'scope_type', 3, '所在机构可见', 3, NULL, 0);
+INSERT INTO `blade_dict`(`id`, `parent_id`, `code`, `dict_key`, `dict_value`, `sort`, `remark`, `is_deleted`) VALUES (1123598814738675235, 1123598814738675231, 'scope_type', 4, '所在机构及子级可见', 4, NULL, 0);
+INSERT INTO `blade_dict`(`id`, `parent_id`, `code`, `dict_key`, `dict_value`, `sort`, `remark`, `is_deleted`) VALUES (1123598814738675236, 1123598814738675231, 'scope_type', 5, '自定义', 5, NULL, 0);
 
 -- ----------------------------
 -- 增加数据权限菜单及权限