smallchill 6 лет назад
Родитель
Сommit
0ad7dc61cf

+ 1 - 1
doc/sql/mysql/bladex-saber-mysql.sql

@@ -166,7 +166,7 @@ CREATE TABLE `blade_dict_biz`  (
   `tenant_id` varchar(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '租户ID',
   `parent_id` bigint(64) NULL DEFAULT 0 COMMENT '父主键',
   `code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '字典码',
-  `dict_key` int(2) NULL DEFAULT NULL COMMENT '字典值',
+  `dict_key`varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '字典值',
   `dict_value` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '字典名称',
   `sort` int(11) NULL DEFAULT NULL COMMENT '排序',
   `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '字典备注',

+ 1 - 1
doc/sql/mysql/bladex-sword-mysql.sql

@@ -166,7 +166,7 @@ CREATE TABLE `blade_dict_biz`  (
   `tenant_id` varchar(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '租户ID',
   `parent_id` bigint(64) NULL DEFAULT 0 COMMENT '父主键',
   `code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '字典码',
-  `dict_key` int(2) NULL DEFAULT NULL COMMENT '字典值',
+  `dict_key` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '字典值',
   `dict_value` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '字典名称',
   `sort` int(11) NULL DEFAULT NULL COMMENT '排序',
   `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '字典备注',

+ 1 - 1
doc/sql/oracle/bladex-saber-oracle.sql

@@ -351,7 +351,7 @@ CREATE TABLE "BLADE_DICT_BIZ" (
   "TENANT_ID" NVARCHAR2(12) ,
   "PARENT_ID" NUMBER(20) ,
   "CODE" NVARCHAR2(255) ,
-  "DICT_KEY" NUMBER(11) ,
+  "DICT_KEY" NVARCHAR2(255) ,
   "DICT_VALUE" NVARCHAR2(255) ,
   "SORT" NUMBER(11) ,
   "REMARK" NVARCHAR2(255) ,

+ 1 - 1
doc/sql/oracle/bladex-sword-oracle.sql

@@ -351,7 +351,7 @@ CREATE TABLE "BLADE_DICT_BIZ" (
   "TENANT_ID" NVARCHAR2(12) ,
   "PARENT_ID" NUMBER(20) ,
   "CODE" NVARCHAR2(255) ,
-  "DICT_KEY" NUMBER(11) ,
+  "DICT_KEY" NVARCHAR2(255) ,
   "DICT_VALUE" NVARCHAR2(255) ,
   "SORT" NUMBER(11) ,
   "REMARK" NVARCHAR2(255) ,

+ 1 - 1
doc/sql/update/mysql-update-2.2.1~2.2.2.sql

@@ -41,7 +41,7 @@ CREATE TABLE `blade_dict_biz`  (
    `tenant_id` varchar(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '租户ID',
    `parent_id` bigint(64) NULL DEFAULT 0 COMMENT '父主键',
    `code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '字典码',
-   `dict_key` int(2) NULL DEFAULT NULL COMMENT '字典值',
+   `dict_key` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '字典值',
    `dict_value` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '字典名称',
    `sort` int(11) NULL DEFAULT NULL COMMENT '排序',
    `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '字典备注',

+ 1 - 1
doc/sql/update/oracle-update-2.2.1~2.2.2.sql

@@ -47,7 +47,7 @@ CREATE TABLE "BLADEX"."BLADE_DICT_BIZ" (
     "TENANT_ID" NVARCHAR2(12) ,
     "PARENT_ID" NUMBER(20) ,
     "CODE" NVARCHAR2(255) ,
-    "DICT_KEY" NUMBER(11) ,
+    "DICT_KEY" NVARCHAR2(255) ,
     "DICT_VALUE" NVARCHAR2(255) ,
     "SORT" NUMBER(11) ,
     "REMARK" NVARCHAR2(255) ,

+ 2 - 3
src/main/java/org/springblade/modules/system/wrapper/DictBizWrapper.java

@@ -16,14 +16,13 @@
  */
 package org.springblade.modules.system.wrapper;
 
-import org.springblade.common.cache.DictCache;
+import org.springblade.common.cache.DictBizCache;
 import org.springblade.core.mp.support.BaseEntityWrapper;
 import org.springblade.core.tool.constant.BladeConstant;
 import org.springblade.core.tool.node.ForestNodeMerger;
 import org.springblade.core.tool.node.INode;
 import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.core.tool.utils.Func;
-import org.springblade.modules.system.entity.Dict;
 import org.springblade.modules.system.entity.DictBiz;
 import org.springblade.modules.system.vo.DictBizVO;
 
@@ -49,7 +48,7 @@ public class DictBizWrapper extends BaseEntityWrapper<DictBiz, DictBizVO> {
 		if (Func.equals(dict.getParentId(), BladeConstant.TOP_PARENT_ID)) {
 			dictVO.setParentName(BladeConstant.TOP_PARENT_NAME);
 		} else {
-			Dict parent = DictCache.getById(dict.getParentId());
+			DictBiz parent = DictBizCache.getById(dict.getParentId());
 			dictVO.setParentName(parent.getDictValue());
 		}
 		return dictVO;