⚡ oracle兼容、常量优化

blade-ops/blade-develop/src/main/java/org/springblade/develop/controller/CodeController.java

@@ -84,7 +84,7 @@ public class CodeController extends BladeController {
 	@ApiOperationSupport(order = 3)
 	@ApiOperation(value = "新增或修改", notes = "传入code")
 	public R submit(@Valid @RequestBody Code code) {
-		return R.status(codeService.saveOrUpdate(code));
+		return R.status(codeService.submit(code));
 	}
 
 

blade-ops/blade-develop/src/main/java/org/springblade/develop/service/ICodeService.java

@@ -27,4 +27,12 @@ import org.springblade.develop.entity.Code;
  */
 public interface ICodeService extends IService<Code> {
 
+	/**
+	 * 提交
+	 *
+	 * @param code
+	 * @return
+	 */
+	boolean submit(Code code);
+
 }

blade-ops/blade-develop/src/main/java/org/springblade/develop/service/impl/CodeServiceImpl.java

@@ -17,6 +17,7 @@
 package org.springblade.develop.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springblade.core.tool.constant.BladeConstant;
 import org.springblade.develop.entity.Code;
 import org.springblade.develop.mapper.CodeMapper;
 import org.springblade.develop.service.ICodeService;
@@ -30,4 +31,9 @@ import org.springframework.stereotype.Service;
 @Service
 public class CodeServiceImpl extends ServiceImpl<CodeMapper, Code> implements ICodeService {
 
+	@Override
+	public boolean submit(Code code) {
+		code.setIsDeleted(BladeConstant.DB_NOT_DELETED);
+		return saveOrUpdate(code);
+	}
 }

blade-service/blade-system/src/main/java/org/springblade/system/controller/MenuController.java

@@ -112,7 +112,7 @@ public class MenuController extends BladeController {
 	@ApiOperationSupport(order = 3)
 	@ApiOperation(value = "新增或修改", notes = "传入menu")
 	public R submit(@Valid @RequestBody Menu menu) {
-		return R.status(menuService.saveOrUpdate(menu));
+		return R.status(menuService.submit(menu));
 	}
 
 

blade-service/blade-system/src/main/java/org/springblade/system/controller/RoleController.java

@@ -105,7 +105,7 @@ public class RoleController extends BladeController {
 		if (Func.isEmpty(role.getId())) {
 			role.setTenantId(user.getTenantId());
 		}
-		return R.status(roleService.saveOrUpdate(role));
+		return R.status(roleService.submit(role));
 	}
 
 

blade-service/blade-system/src/main/java/org/springblade/system/mapper/DictMapper.xml

@@ -35,7 +35,7 @@
     <select id="getValue" resultType="java.lang.String">
         select
             dict_value
-        from blade_dict where code = #{param1} and dict_key = #{param2} and is_deleted = 0 limit 1
+        from blade_dict where code = #{param1} and dict_key = #{param2} and is_deleted = 0
     </select>
 
     <!-- oracle 版本 -->

blade-service/blade-system/src/main/java/org/springblade/system/service/IMenuService.java

@@ -145,4 +145,12 @@ public interface IMenuService extends IService<Menu> {
 	 */
 	boolean removeMenu(String ids);
 
+	/**
+	 * 提交
+	 *
+	 * @param menu
+	 * @return
+	 */
+	boolean submit(Menu menu);
+
 }

blade-service/blade-system/src/main/java/org/springblade/system/service/IRoleService.java

@@ -75,4 +75,12 @@ public interface IRoleService extends IService<Role> {
 	 */
 	List<String> getRoleAliases(String roleIds);
 
+	/**
+	 * 提交
+	 *
+	 * @param role
+	 * @return
+	 */
+	boolean submit(Role role);
+
 }

blade-service/blade-system/src/main/java/org/springblade/system/service/impl/DeptServiceImpl.java

@@ -20,7 +20,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.exceptions.ApiException;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springblade.common.constant.CommonConstant;
+import org.springblade.core.tool.constant.BladeConstant;
 import org.springblade.core.tool.node.ForestNodeMerger;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.StringPool;
@@ -67,13 +67,14 @@ public class DeptServiceImpl extends ServiceImpl<DeptMapper, Dept> implements ID
 	@Override
 	public boolean submit(Dept dept) {
 		if (dept.getParentId() == null) {
-			dept.setParentId(CommonConstant.TOP_PARENT_ID);
+			dept.setParentId(BladeConstant.TOP_PARENT_ID);
 		}
 		if (dept.getParentId() > 0) {
 			Dept parent = getById(dept.getParentId());
 			String ancestors = parent.getAncestors() + StringPool.COMMA + dept.getParentId();
 			dept.setAncestors(ancestors);
 		}
+		dept.setIsDeleted(BladeConstant.DB_NOT_DELETED);
 		return saveOrUpdate(dept);
 	}
 

blade-service/blade-system/src/main/java/org/springblade/system/service/impl/DictServiceImpl.java

@@ -21,6 +21,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.exceptions.ApiException;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springblade.core.tool.constant.BladeConstant;
 import org.springblade.core.tool.node.ForestNodeMerger;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.StringPool;
@@ -72,6 +73,7 @@ public class DictServiceImpl extends ServiceImpl<DictMapper, Dict> implements ID
 		if (cnt > 0) {
 			throw new ApiException("当前字典键值已存在!");
 		}
+		dict.setIsDeleted(BladeConstant.DB_NOT_DELETED);
 		return saveOrUpdate(dict);
 	}
 

blade-service/blade-system/src/main/java/org/springblade/system/service/impl/MenuServiceImpl.java

@@ -170,4 +170,10 @@ public class MenuServiceImpl extends ServiceImpl<MenuMapper, Menu> implements IM
 		return removeByIds(Func.toLongList(ids));
 	}
 
+	@Override
+	public boolean submit(Menu menu) {
+		menu.setIsDeleted(BladeConstant.DB_NOT_DELETED);
+		return saveOrUpdate(menu);
+	}
+
 }

blade-service/blade-system/src/main/java/org/springblade/system/service/impl/RoleServiceImpl.java

@@ -21,6 +21,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.AllArgsConstructor;
 import org.springblade.core.secure.utils.SecureUtil;
+import org.springblade.core.tool.constant.BladeConstant;
 import org.springblade.core.tool.constant.RoleConstant;
 import org.springblade.core.tool.node.ForestNodeMerger;
 import org.springblade.core.tool.utils.CollectionUtil;
@@ -136,4 +137,10 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper, Role> implements IR
 		return baseMapper.getRoleAliases(Func.toStrArray(roleIds));
 	}
 
+	@Override
+	public boolean submit(Role role) {
+		role.setIsDeleted(BladeConstant.DB_NOT_DELETED);
+		return saveOrUpdate(role);
+	}
+
 }

blade-service/blade-system/src/main/java/org/springblade/system/service/impl/TenantServiceImpl.java

@@ -19,7 +19,6 @@ package org.springblade.system.service.impl;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.AllArgsConstructor;
-import org.springblade.common.constant.CommonConstant;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.tenant.TenantId;
 import org.springblade.core.tool.constant.BladeConstant;
@@ -66,7 +65,7 @@ public class TenantServiceImpl extends BaseServiceImpl<TenantMapper, Tenant> imp
 			// 新建租户对应的默认角色
 			Role role = new Role();
 			role.setTenantId(tenantId);
-			role.setParentId(CommonConstant.TOP_PARENT_ID);
+			role.setParentId(BladeConstant.TOP_PARENT_ID);
 			role.setRoleName("管理员");
 			role.setRoleAlias("admin");
 			role.setSort(2);
@@ -75,7 +74,7 @@ public class TenantServiceImpl extends BaseServiceImpl<TenantMapper, Tenant> imp
 			// 新建租户对应的默认部门
 			Dept dept = new Dept();
 			dept.setTenantId(tenantId);
-			dept.setParentId(CommonConstant.TOP_PARENT_ID);
+			dept.setParentId(BladeConstant.TOP_PARENT_ID);
 			dept.setDeptName(tenant.getTenantName());
 			dept.setFullName(tenant.getTenantName());
 			dept.setSort(2);

blade-service/blade-system/src/main/java/org/springblade/system/wrapper/DeptWrapper.java

@@ -18,6 +18,7 @@ package org.springblade.system.wrapper;
 
 import org.springblade.common.constant.CommonConstant;
 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;
@@ -46,8 +47,8 @@ public class DeptWrapper extends BaseEntityWrapper<Dept, DeptVO> {
 	public DeptVO entityVO(Dept dept) {
 		DeptVO deptVO = BeanUtil.copy(dept, DeptVO.class);
 		assert deptVO != null;
-		if (Func.equals(dept.getParentId(), CommonConstant.TOP_PARENT_ID)) {
-			deptVO.setParentName(CommonConstant.TOP_PARENT_NAME);
+		if (Func.equals(dept.getParentId(), BladeConstant.TOP_PARENT_ID)) {
+			deptVO.setParentName(BladeConstant.TOP_PARENT_NAME);
 		} else {
 			Dept parent = SysCache.getDept(dept.getParentId());
 			deptVO.setParentName(parent.getDeptName());

blade-service/blade-system/src/main/java/org/springblade/system/wrapper/DictWrapper.java

@@ -16,8 +16,8 @@
  */
 package org.springblade.system.wrapper;
 
-import org.springblade.common.constant.CommonConstant;
 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;
@@ -44,8 +44,8 @@ public class DictWrapper extends BaseEntityWrapper<Dict, DictVO> {
 	public DictVO entityVO(Dict dict) {
 		DictVO dictVO = BeanUtil.copy(dict, DictVO.class);
 		assert dictVO != null;
-		if (Func.equals(dict.getParentId(), CommonConstant.TOP_PARENT_ID)) {
-			dictVO.setParentName(CommonConstant.TOP_PARENT_NAME);
+		if (Func.equals(dict.getParentId(), BladeConstant.TOP_PARENT_ID)) {
+			dictVO.setParentName(BladeConstant.TOP_PARENT_NAME);
 		} else {
 			Dict parent = DictCache.getById(dict.getParentId());
 			dictVO.setParentName(parent.getDictValue());

blade-service/blade-system/src/main/java/org/springblade/system/wrapper/MenuWrapper.java

@@ -16,8 +16,8 @@
  */
 package org.springblade.system.wrapper;
 
-import org.springblade.common.constant.CommonConstant;
 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.utils.BeanUtil;
 import org.springblade.core.tool.utils.Func;
@@ -44,8 +44,8 @@ public class MenuWrapper extends BaseEntityWrapper<Menu, MenuVO> {
 	public MenuVO entityVO(Menu menu) {
 		MenuVO menuVO = BeanUtil.copy(menu, MenuVO.class);
 		assert menuVO != null;
-		if (Func.equals(menu.getParentId(), CommonConstant.TOP_PARENT_ID)) {
-			menuVO.setParentName(CommonConstant.TOP_PARENT_NAME);
+		if (Func.equals(menu.getParentId(), BladeConstant.TOP_PARENT_ID)) {
+			menuVO.setParentName(BladeConstant.TOP_PARENT_NAME);
 		} else {
 			Menu parent = SysCache.getMenu(menu.getParentId());
 			menuVO.setParentName(parent.getName());

blade-service/blade-system/src/main/java/org/springblade/system/wrapper/RoleWrapper.java

@@ -16,8 +16,8 @@
  */
 package org.springblade.system.wrapper;
 
-import org.springblade.common.constant.CommonConstant;
 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;
@@ -44,8 +44,8 @@ public class RoleWrapper extends BaseEntityWrapper<Role, RoleVO> {
 	public RoleVO entityVO(Role role) {
 		RoleVO roleVO = BeanUtil.copy(role, RoleVO.class);
 		assert roleVO != null;
-		if (Func.equals(role.getParentId(), CommonConstant.TOP_PARENT_ID)) {
-			roleVO.setParentName(CommonConstant.TOP_PARENT_NAME);
+		if (Func.equals(role.getParentId(), BladeConstant.TOP_PARENT_ID)) {
+			roleVO.setParentName(BladeConstant.TOP_PARENT_NAME);
 		} else {
 			Role parent = SysCache.getRole(role.getParentId());
 			roleVO.setParentName(parent.getRoleName());

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

@@ -229,9 +229,9 @@ COMMENT ON TABLE "BLADE_DICT" IS '字典表';
 -- ----------------------------
 -- Records of BLADE_DICT
 -- ----------------------------
-INSERT INTO "BLADE_DICT" VALUES ('1123598814738675201', '0', 'SEX', '-1', '性别', '1', NULL, '0');
-INSERT INTO "BLADE_DICT" VALUES ('1123598814738675202', '1123598814738675201', 'SEX', '1', '男', '1', NULL, '0');
-INSERT INTO "BLADE_DICT" VALUES ('1123598814738675203', '1123598814738675201', 'SEX', '2', '女', '2', NULL, '0');
+INSERT INTO "BLADE_DICT" VALUES ('1123598814738675201', '0', 'sex', '-1', '性别', '1', NULL, '0');
+INSERT INTO "BLADE_DICT" VALUES ('1123598814738675202', '1123598814738675201', 'sex', '1', '男', '1', NULL, '0');
+INSERT INTO "BLADE_DICT" VALUES ('1123598814738675203', '1123598814738675201', 'sex', '2', '女', '2', NULL, '0');
 INSERT INTO "BLADE_DICT" VALUES ('1123598814738675204', '0', 'notice', '-1', '通知类型', '2', NULL, '0');
 INSERT INTO "BLADE_DICT" VALUES ('1123598814738675205', '1123598814738675204', 'notice', '1', '发布通知', '1', NULL, '0');
 INSERT INTO "BLADE_DICT" VALUES ('1123598814738675206', '1123598814738675204', 'notice', '2', '批转通知', '2', NULL, '0');
@@ -239,9 +239,9 @@ INSERT INTO "BLADE_DICT" VALUES ('1123598814738675207', '1123598814738675204', '
 INSERT INTO "BLADE_DICT" VALUES ('1123598814738675208', '1123598814738675204', 'notice', '4', '指示通知', '4', NULL, '0');
 INSERT INTO "BLADE_DICT" VALUES ('1123598814738675209', '1123598814738675204', 'notice', '5', '任免通知', '5', NULL, '0');
 INSERT INTO "BLADE_DICT" VALUES ('1123598814738675210', '1123598814738675204', 'notice', '6', '事务通知', '6', NULL, '0');
-INSERT INTO "BLADE_DICT" VALUES ('1123598814738675211', '0', 'menu_CATEGORY', '-1', '菜单类型', '3', NULL, '0');
-INSERT INTO "BLADE_DICT" VALUES ('1123598814738675212', '1123598814738675211', 'menu_CATEGORY', '1', '菜单', '1', NULL, '0');
-INSERT INTO "BLADE_DICT" VALUES ('1123598814738675213', '1123598814738675211', 'menu_CATEGORY', '2', '按钮', '2', NULL, '0');
+INSERT INTO "BLADE_DICT" VALUES ('1123598814738675211', '0', 'menu_category', '-1', '菜单类型', '3', NULL, '0');
+INSERT INTO "BLADE_DICT" VALUES ('1123598814738675212', '1123598814738675211', 'menu_category', '1', '菜单', '1', NULL, '0');
+INSERT INTO "BLADE_DICT" VALUES ('1123598814738675213', '1123598814738675211', 'menu_category', '2', '按钮', '2', NULL, '0');
 INSERT INTO "BLADE_DICT" VALUES ('1123598814738675214', '0', 'button_func', '-1', '按钮功能', '4', NULL, '0');
 INSERT INTO "BLADE_DICT" VALUES ('1123598814738675215', '1123598814738675214', 'button_func', '1', '工具栏', '1', NULL, '0');
 INSERT INTO "BLADE_DICT" VALUES ('1123598814738675216', '1123598814738675214', 'button_func', '2', '操作栏', '2', NULL, '0');
@@ -255,22 +255,22 @@ INSERT INTO "BLADE_DICT" VALUES ('1123598814738675223', '1123598814738675221', '
 INSERT INTO "BLADE_DICT" VALUES ('1123598814738675224', '0', 'oss', '-1', '对象存储类型', '6', NULL, '0');
 INSERT INTO "BLADE_DICT" VALUES ('1123598814738675225', '1123598814738675224', 'oss', '1', 'minio', '1', NULL, '0');
 INSERT INTO "BLADE_DICT" VALUES ('1123598814738675226', '1123598814738675224', 'oss', '2', 'qiniu', '2', NULL, '0');
-INSERT INTO "BLADE_DICT" VALUES ('1123598814738675227', '0', 'org_CATEGORY', '-1', '机构类型', '7', NULL, '0');
-INSERT INTO "BLADE_DICT" VALUES ('1123598814738675228', '1123598814738675227', 'org_CATEGORY', '1', '公司', '1', NULL, '0');
-INSERT INTO "BLADE_DICT" VALUES ('1123598814738675229', '1123598814738675227', 'org_CATEGORY', '2', '部门', '2', NULL, '0');
-INSERT INTO "BLADE_DICT" VALUES ('1123598814738675230', '1123598814738675227', 'org_CATEGORY', '3', '小组', '3', NULL, '0');
-INSERT INTO "BLADE_DICT" VALUES ('1123598814738675231', '0', 'data_SCOPE_TYPE', '-1', '数据权限', '8', NULL, '0');
-INSERT INTO "BLADE_DICT" VALUES ('1123598814738675232', '1123598814738675231', 'data_SCOPE_TYPE', '1', '全部可见', '1', NULL, '0');
-INSERT INTO "BLADE_DICT" VALUES ('1123598814738675233', '1123598814738675231', 'data_SCOPE_TYPE', '2', '本人可见', '2', NULL, '0');
-INSERT INTO "BLADE_DICT" VALUES ('1123598814738675234', '1123598814738675231', 'data_SCOPE_TYPE', '3', '所在机构可见', '3', NULL, '0');
-INSERT INTO "BLADE_DICT" VALUES ('1123598814738675235', '1123598814738675231', 'data_SCOPE_TYPE', '4', '所在机构及子级可见', '4', NULL, '0');
-INSERT INTO "BLADE_DICT" VALUES ('1123598814738675236', '1123598814738675231', 'data_SCOPE_TYPE', '5', '自定义', '5', NULL, '0');
-INSERT INTO "BLADE_DICT" VALUES ('1123598814738675237', '0', 'api_SCOPE_TYPE', '-1', '接口权限', '10', NULL, '0');
-INSERT INTO "BLADE_DICT" VALUES ('1123598814738675238', '1123598814738675237', 'api_SCOPE_TYPE', '1', '系统接口', '1', NULL, '0');
-INSERT INTO "BLADE_DICT" VALUES ('1123598814738675239', '1123598814738675237', 'api_SCOPE_TYPE', '2', '业务接口', '2', NULL, '0');
-INSERT INTO "BLADE_DICT" VALUES ('1123598814738675240', '0', 'SCOPE_CATEGORY', '-1', '权限类型', '10', NULL, '0');
-INSERT INTO "BLADE_DICT" VALUES ('1123598814738675241', '1123598814738675240', 'SCOPE_CATEGORY', '1', '数据权限', '1', NULL, '0');
-INSERT INTO "BLADE_DICT" VALUES ('1123598814738675242', '1123598814738675240', 'SCOPE_CATEGORY', '2', '接口权限', '2', NULL, '0');
+INSERT INTO "BLADE_DICT" VALUES ('1123598814738675227', '0', 'org_category', '-1', '机构类型', '7', NULL, '0');
+INSERT INTO "BLADE_DICT" VALUES ('1123598814738675228', '1123598814738675227', 'org_category', '1', '公司', '1', NULL, '0');
+INSERT INTO "BLADE_DICT" VALUES ('1123598814738675229', '1123598814738675227', 'org_category', '2', '部门', '2', NULL, '0');
+INSERT INTO "BLADE_DICT" VALUES ('1123598814738675230', '1123598814738675227', 'org_category', '3', '小组', '3', NULL, '0');
+INSERT INTO "BLADE_DICT" VALUES ('1123598814738675231', '0', 'data_scope_type', '-1', '数据权限', '8', NULL, '0');
+INSERT INTO "BLADE_DICT" VALUES ('1123598814738675232', '1123598814738675231', 'data_scope_type', '1', '全部可见', '1', NULL, '0');
+INSERT INTO "BLADE_DICT" VALUES ('1123598814738675233', '1123598814738675231', 'data_scope_type', '2', '本人可见', '2', NULL, '0');
+INSERT INTO "BLADE_DICT" VALUES ('1123598814738675234', '1123598814738675231', 'data_scope_type', '3', '所在机构可见', '3', NULL, '0');
+INSERT INTO "BLADE_DICT" VALUES ('1123598814738675235', '1123598814738675231', 'data_scope_type', '4', '所在机构及子级可见', '4', NULL, '0');
+INSERT INTO "BLADE_DICT" VALUES ('1123598814738675236', '1123598814738675231', 'data_scope_type', '5', '自定义', '5', NULL, '0');
+INSERT INTO "BLADE_DICT" VALUES ('1123598814738675237', '0', 'api_scope_type', '-1', '接口权限', '10', NULL, '0');
+INSERT INTO "BLADE_DICT" VALUES ('1123598814738675238', '1123598814738675237', 'api_scope_type', '1', '系统接口', '1', NULL, '0');
+INSERT INTO "BLADE_DICT" VALUES ('1123598814738675239', '1123598814738675237', 'api_scope_type', '2', '业务接口', '2', NULL, '0');
+INSERT INTO "BLADE_DICT" VALUES ('1123598814738675240', '0', 'scope_category', '-1', '权限类型', '10', NULL, '0');
+INSERT INTO "BLADE_DICT" VALUES ('1123598814738675241', '1123598814738675240', 'scope_category', '1', '数据权限', '1', NULL, '0');
+INSERT INTO "BLADE_DICT" VALUES ('1123598814738675242', '1123598814738675240', 'scope_category', '2', '接口权限', '2', NULL, '0');
 COMMIT;
 
 -- ----------------------------

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

@@ -229,9 +229,9 @@ COMMENT ON TABLE "BLADE_DICT" IS '字典表';
 -- ----------------------------
 -- Records of BLADE_DICT
 -- ----------------------------
-INSERT INTO "BLADE_DICT" VALUES ('1123598814738675201', '0', 'SEX', '-1', '性别', '1', NULL, '0');
-INSERT INTO "BLADE_DICT" VALUES ('1123598814738675202', '1123598814738675201', 'SEX', '1', '男', '1', NULL, '0');
-INSERT INTO "BLADE_DICT" VALUES ('1123598814738675203', '1123598814738675201', 'SEX', '2', '女', '2', NULL, '0');
+INSERT INTO "BLADE_DICT" VALUES ('1123598814738675201', '0', 'sex', '-1', '性别', '1', NULL, '0');
+INSERT INTO "BLADE_DICT" VALUES ('1123598814738675202', '1123598814738675201', 'sex', '1', '男', '1', NULL, '0');
+INSERT INTO "BLADE_DICT" VALUES ('1123598814738675203', '1123598814738675201', 'sex', '2', '女', '2', NULL, '0');
 INSERT INTO "BLADE_DICT" VALUES ('1123598814738675204', '0', 'notice', '-1', '通知类型', '2', NULL, '0');
 INSERT INTO "BLADE_DICT" VALUES ('1123598814738675205', '1123598814738675204', 'notice', '1', '发布通知', '1', NULL, '0');
 INSERT INTO "BLADE_DICT" VALUES ('1123598814738675206', '1123598814738675204', 'notice', '2', '批转通知', '2', NULL, '0');
@@ -239,9 +239,9 @@ INSERT INTO "BLADE_DICT" VALUES ('1123598814738675207', '1123598814738675204', '
 INSERT INTO "BLADE_DICT" VALUES ('1123598814738675208', '1123598814738675204', 'notice', '4', '指示通知', '4', NULL, '0');
 INSERT INTO "BLADE_DICT" VALUES ('1123598814738675209', '1123598814738675204', 'notice', '5', '任免通知', '5', NULL, '0');
 INSERT INTO "BLADE_DICT" VALUES ('1123598814738675210', '1123598814738675204', 'notice', '6', '事务通知', '6', NULL, '0');
-INSERT INTO "BLADE_DICT" VALUES ('1123598814738675211', '0', 'menu_CATEGORY', '-1', '菜单类型', '3', NULL, '0');
-INSERT INTO "BLADE_DICT" VALUES ('1123598814738675212', '1123598814738675211', 'menu_CATEGORY', '1', '菜单', '1', NULL, '0');
-INSERT INTO "BLADE_DICT" VALUES ('1123598814738675213', '1123598814738675211', 'menu_CATEGORY', '2', '按钮', '2', NULL, '0');
+INSERT INTO "BLADE_DICT" VALUES ('1123598814738675211', '0', 'menu_category', '-1', '菜单类型', '3', NULL, '0');
+INSERT INTO "BLADE_DICT" VALUES ('1123598814738675212', '1123598814738675211', 'menu_category', '1', '菜单', '1', NULL, '0');
+INSERT INTO "BLADE_DICT" VALUES ('1123598814738675213', '1123598814738675211', 'menu_category', '2', '按钮', '2', NULL, '0');
 INSERT INTO "BLADE_DICT" VALUES ('1123598814738675214', '0', 'button_func', '-1', '按钮功能', '4', NULL, '0');
 INSERT INTO "BLADE_DICT" VALUES ('1123598814738675215', '1123598814738675214', 'button_func', '1', '工具栏', '1', NULL, '0');
 INSERT INTO "BLADE_DICT" VALUES ('1123598814738675216', '1123598814738675214', 'button_func', '2', '操作栏', '2', NULL, '0');
@@ -255,22 +255,22 @@ INSERT INTO "BLADE_DICT" VALUES ('1123598814738675223', '1123598814738675221', '
 INSERT INTO "BLADE_DICT" VALUES ('1123598814738675224', '0', 'oss', '-1', '对象存储类型', '6', NULL, '0');
 INSERT INTO "BLADE_DICT" VALUES ('1123598814738675225', '1123598814738675224', 'oss', '1', 'minio', '1', NULL, '0');
 INSERT INTO "BLADE_DICT" VALUES ('1123598814738675226', '1123598814738675224', 'oss', '2', 'qiniu', '2', NULL, '0');
-INSERT INTO "BLADE_DICT" VALUES ('1123598814738675227', '0', 'org_CATEGORY', '-1', '机构类型', '7', NULL, '0');
-INSERT INTO "BLADE_DICT" VALUES ('1123598814738675228', '1123598814738675227', 'org_CATEGORY', '1', '公司', '1', NULL, '0');
-INSERT INTO "BLADE_DICT" VALUES ('1123598814738675229', '1123598814738675227', 'org_CATEGORY', '2', '部门', '2', NULL, '0');
-INSERT INTO "BLADE_DICT" VALUES ('1123598814738675230', '1123598814738675227', 'org_CATEGORY', '3', '小组', '3', NULL, '0');
-INSERT INTO "BLADE_DICT" VALUES ('1123598814738675231', '0', 'data_SCOPE_TYPE', '-1', '数据权限', '8', NULL, '0');
-INSERT INTO "BLADE_DICT" VALUES ('1123598814738675232', '1123598814738675231', 'data_SCOPE_TYPE', '1', '全部可见', '1', NULL, '0');
-INSERT INTO "BLADE_DICT" VALUES ('1123598814738675233', '1123598814738675231', 'data_SCOPE_TYPE', '2', '本人可见', '2', NULL, '0');
-INSERT INTO "BLADE_DICT" VALUES ('1123598814738675234', '1123598814738675231', 'data_SCOPE_TYPE', '3', '所在机构可见', '3', NULL, '0');
-INSERT INTO "BLADE_DICT" VALUES ('1123598814738675235', '1123598814738675231', 'data_SCOPE_TYPE', '4', '所在机构及子级可见', '4', NULL, '0');
-INSERT INTO "BLADE_DICT" VALUES ('1123598814738675236', '1123598814738675231', 'data_SCOPE_TYPE', '5', '自定义', '5', NULL, '0');
-INSERT INTO "BLADE_DICT" VALUES ('1123598814738675237', '0', 'api_SCOPE_TYPE', '-1', '接口权限', '10', NULL, '0');
-INSERT INTO "BLADE_DICT" VALUES ('1123598814738675238', '1123598814738675237', 'api_SCOPE_TYPE', '1', '系统接口', '1', NULL, '0');
-INSERT INTO "BLADE_DICT" VALUES ('1123598814738675239', '1123598814738675237', 'api_SCOPE_TYPE', '2', '业务接口', '2', NULL, '0');
-INSERT INTO "BLADE_DICT" VALUES ('1123598814738675240', '0', 'SCOPE_CATEGORY', '-1', '权限类型', '10', NULL, '0');
-INSERT INTO "BLADE_DICT" VALUES ('1123598814738675241', '1123598814738675240', 'SCOPE_CATEGORY', '1', '数据权限', '1', NULL, '0');
-INSERT INTO "BLADE_DICT" VALUES ('1123598814738675242', '1123598814738675240', 'SCOPE_CATEGORY', '2', '接口权限', '2', NULL, '0');
+INSERT INTO "BLADE_DICT" VALUES ('1123598814738675227', '0', 'org_category', '-1', '机构类型', '7', NULL, '0');
+INSERT INTO "BLADE_DICT" VALUES ('1123598814738675228', '1123598814738675227', 'org_category', '1', '公司', '1', NULL, '0');
+INSERT INTO "BLADE_DICT" VALUES ('1123598814738675229', '1123598814738675227', 'org_category', '2', '部门', '2', NULL, '0');
+INSERT INTO "BLADE_DICT" VALUES ('1123598814738675230', '1123598814738675227', 'org_category', '3', '小组', '3', NULL, '0');
+INSERT INTO "BLADE_DICT" VALUES ('1123598814738675231', '0', 'data_scope_type', '-1', '数据权限', '8', NULL, '0');
+INSERT INTO "BLADE_DICT" VALUES ('1123598814738675232', '1123598814738675231', 'data_scope_type', '1', '全部可见', '1', NULL, '0');
+INSERT INTO "BLADE_DICT" VALUES ('1123598814738675233', '1123598814738675231', 'data_scope_type', '2', '本人可见', '2', NULL, '0');
+INSERT INTO "BLADE_DICT" VALUES ('1123598814738675234', '1123598814738675231', 'data_scope_type', '3', '所在机构可见', '3', NULL, '0');
+INSERT INTO "BLADE_DICT" VALUES ('1123598814738675235', '1123598814738675231', 'data_scope_type', '4', '所在机构及子级可见', '4', NULL, '0');
+INSERT INTO "BLADE_DICT" VALUES ('1123598814738675236', '1123598814738675231', 'data_scope_type', '5', '自定义', '5', NULL, '0');
+INSERT INTO "BLADE_DICT" VALUES ('1123598814738675237', '0', 'api_scope_type', '-1', '接口权限', '10', NULL, '0');
+INSERT INTO "BLADE_DICT" VALUES ('1123598814738675238', '1123598814738675237', 'api_scope_type', '1', '系统接口', '1', NULL, '0');
+INSERT INTO "BLADE_DICT" VALUES ('1123598814738675239', '1123598814738675237', 'api_scope_type', '2', '业务接口', '2', NULL, '0');
+INSERT INTO "BLADE_DICT" VALUES ('1123598814738675240', '0', 'scope_category', '-1', '权限类型', '10', NULL, '0');
+INSERT INTO "BLADE_DICT" VALUES ('1123598814738675241', '1123598814738675240', 'scope_category', '1', '数据权限', '1', NULL, '0');
+INSERT INTO "BLADE_DICT" VALUES ('1123598814738675242', '1123598814738675240', 'scope_category', '2', '接口权限', '2', NULL, '0');
 COMMIT;
 
 -- ----------------------------