Merge branch 'develop' of https://github.com/dibo-software/diboot-v2 into develop

build.gradle

@@ -38,6 +38,7 @@ subprojects {
         mybatisPlusVersion = "3.2.0"
         fastjsonVersion = "1.2.60"
         lombokVersion = "1.18.8"
+
     }
     dependencies {
         // Gradle 5.0及以上版本，使用如下方式

diboot-core/src/main/java/com/diboot/core/binding/parser/ConditionParser.java

@@ -146,6 +146,12 @@ public class ConditionParser implements ExpressionVisitor,ItemsListVisitor {
     @Override
     public void visit(ExpressionList expressionList) {
     }
+
+    @Override
+    public void visit(NamedExpressionList namedExpressionList) {
+
+    }
+
     @Override
     public void visit(MultiExpressionList multiExprList) {
     }
@@ -239,6 +245,19 @@ public class ConditionParser implements ExpressionVisitor,ItemsListVisitor {
     @Override
     public void visit(NotExpression aThis) {
     }
+
+    @Override
+    public void visit(NextValExpression aThis) {
+    }
+
+    @Override
+    public void visit(CollateExpression aThis) {
+    }
+
+    @Override
+    public void visit(SimilarToExpression aThis) {
+    }
+
     @Override
     public void visit(BitwiseRightShift aThis) {
     }

diboot-core/src/test/resources/init-mysql.sql

@@ -8,27 +8,26 @@ create table department
   org_id bigint not null comment '单位ID',
   name varchar(50) not null comment '名称',
   extdata varchar(100) null comment '扩展字段',
-  deleted tinyint(1) default 0 not null comment '已删除',
+  is_deleted tinyint(1) default 0 not null comment '已删除',
   create_time timestamp default CURRENT_TIMESTAMP not null comment '创建时间'
 )
   comment '组织单位' charset=utf8mb4;
 
-create table dictionary
-(
-  id int unsigned auto_increment comment 'ID'
-    primary key,
-  parent_id int unsigned not null comment '父ID',
-  type varchar(50) not null comment '字典类型',
-  item_name varchar(100) not null comment '字典项显示名',
-  item_value varchar(100) null comment '字典项存储值',
-  comment varchar(200) null comment '备注',
-  extdata varchar(200) null comment '扩展属性',
-  sort_id smallint(6) default 99 not null comment '排序号',
-  `system` tinyint(1) default 0 not null comment '是否系统预置',
-  editable tinyint(1) default 1 not null comment '是否可编辑',
-  deleted tinyint(1) default 0 not null comment '已删除',
-  create_time timestamp default CURRENT_TIMESTAMP not null comment '创建时间'
-);
+CREATE TABLE `dictionary` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'ID',
+  `parent_id` int unsigned NOT NULL COMMENT '父ID',
+  `type` varchar(50) NOT NULL COMMENT '字典类型',
+  `item_name` varchar(100) NOT NULL COMMENT '显示名',
+  `item_value` varchar(100) DEFAULT NULL COMMENT '存储值',
+  `description` varchar(100) DEFAULT NULL COMMENT '描述说明',
+  `extdata` varchar(200) DEFAULT NULL COMMENT '扩展JSON',
+  `sort_id` smallint NOT NULL DEFAULT '99' COMMENT '排序号',
+  `is_editable` tinyint(1) NOT NULL DEFAULT '1' COMMENT '是否可改',
+  `is_deletable` tinyint(1) NOT NULL DEFAULT '0' COMMENT '是否可删',
+  `is_deleted` tinyint(1) NOT NULL DEFAULT '0' COMMENT '删除标记',
+  `create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+  PRIMARY KEY (`id`)
+) AUTO_INCREMENT=10000 DEFAULT CHARSET=utf8 COMMENT '数据字典';
 
 create table organization
 (
@@ -37,7 +36,7 @@ create table organization
   parent_id int default 0 not null comment '上级单位ID',
   name varchar(100) not null comment '名称',
   telphone varchar(20) null comment '电话',
-  deleted tinyint(1) default 0 not null comment '是否有效',
+  is_deleted tinyint(1) default 0 not null comment '是否有效',
   create_time timestamp default CURRENT_TIMESTAMP not null comment '创建时间'
 )
   comment '组织单位' charset=utf8mb4;
@@ -48,7 +47,7 @@ create table role
     primary key,
   name varchar(20) null,
   code varchar(20) null,
-  deleted tinyint(1) default 0 null,
+  is_deleted tinyint(1) default 0 null,
   create_time timestamp default CURRENT_TIMESTAMP null comment '创建时间'
 );
 
@@ -59,7 +58,7 @@ create table user
   department_id int default 0 not null,
   username varchar(20) null,
   gender varchar(20) null,
-  deleted tinyint(1) default 0 null,
+  is_deleted tinyint(1) default 0 null,
   create_time timestamp default CURRENT_TIMESTAMP null comment '创建时间'
 );
 
@@ -74,8 +73,8 @@ create table user_role
 INSERT INTO department (id, parent_id, org_id, name)
 VALUES (10001, 0, 100001, '产品部'), (10002, 10001, 100001, '研发组'), (10003, 10001, 100001, '测试组');
 
-INSERT INTO dictionary (id, parent_id, type, item_name, item_value, comment, extdata, sort_id, `system`, editable)
-VALUES (1, 0, 'GENDER', '性别', null, '', null, 99, 1, 1), (2, 1, 'GENDER', '男', 'M', null, null, 99, 1, 0), (3, 1, 'GENDER', '女', 'F', null, null, 99, 1, 0);
+INSERT INTO dictionary (id, parent_id, type, item_name, item_value, description, extdata, sort_id, `is_deletable`, is_editable)
+VALUES (1, 0, 'GENDER', '性别', null, '', null, 99, 0, 1), (2, 1, 'GENDER', '男', 'M', null, null, 99, 0, 1), (3, 1, 'GENDER', '女', 'F', null, null, 99, 0, 1);
 
 INSERT INTO organization (id, parent_id, name, telphone) VALUES (100001, 0, '苏州帝博', '0512-62988949');