diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysTenant.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysTenant.java index a0ac71735..e65fdf517 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysTenant.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysTenant.java @@ -59,6 +59,11 @@ public class SysTenant extends BaseEntity { */ private String address; + /** + * 域名 + */ + private String domain; + /** * 企业简介 */ diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysTenantBo.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysTenantBo.java index b1d9fb6b3..b9e97af1d 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysTenantBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysTenantBo.java @@ -71,6 +71,11 @@ public class SysTenantBo extends BaseEntity { */ private String address; + /** + * 域名 + */ + private String domain; + /** * 企业简介 */ diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysTenantVo.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysTenantVo.java index f4b55673f..51b573a5f 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysTenantVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysTenantVo.java @@ -65,6 +65,12 @@ public class SysTenantVo implements Serializable { @ExcelProperty(value = "地址") private String address; + /** + * 域名 + */ + @ExcelProperty(value = "域名") + private String domain; + /** * 企业简介 */ diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTenantServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTenantServiceImpl.java index dfd5010b3..d41d5be4b 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTenantServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTenantServiceImpl.java @@ -100,6 +100,7 @@ public class SysTenantServiceImpl implements ISysTenantService { lqw.eq(StringUtils.isNotBlank(bo.getLicenseNumber()), SysTenant::getLicenseNumber, bo.getLicenseNumber()); lqw.eq(StringUtils.isNotBlank(bo.getAddress()), SysTenant::getAddress, bo.getAddress()); lqw.eq(StringUtils.isNotBlank(bo.getIntro()), SysTenant::getIntro, bo.getIntro()); + lqw.like(StringUtils.isNotBlank(bo.getDomain()), SysTenant::getDomain, bo.getDomain()); lqw.eq(bo.getPackageId() != null, SysTenant::getPackageId, bo.getPackageId()); lqw.eq(bo.getExpireTime() != null, SysTenant::getExpireTime, bo.getExpireTime()); lqw.eq(bo.getAccountCount() != null, SysTenant::getAccountCount, bo.getAccountCount()); diff --git a/script/sql/oracle/oracle_ry_vue_5.X.sql b/script/sql/oracle/oracle_ry_vue_5.X.sql index da49cd310..07082a099 100644 --- a/script/sql/oracle/oracle_ry_vue_5.X.sql +++ b/script/sql/oracle/oracle_ry_vue_5.X.sql @@ -10,6 +10,7 @@ create table sys_tenant ( license_number varchar2(30) default '', address varchar2(200) default '', intro varchar2(200) default '', + domain varchar2(200) default '', remark varchar2(200) default '', package_id number(20) default null, expire_time date default null, @@ -49,7 +50,7 @@ comment on column sys_tenant.update_time is '更新时间'; -- 初始化-租户表数据 -- ---------------------------- -insert into sys_tenant values(1, '000000', '管理组', '15888888888', 'XXX有限公司', null, null, '多租户通用后台管理管理系统', null, null, null, -1, '0', '0', 103, 1, sysdate, null, null); +insert into sys_tenant values(1, '000000', '管理组', '15888888888', 'XXX有限公司', null, null, '多租户通用后台管理管理系统', null, null, null, null, -1, '0', '0', 103, 1, sysdate, null, null); -- ---------------------------- diff --git a/script/sql/postgres/postgres_ry_vue_5.X.sql b/script/sql/postgres/postgres_ry_vue_5.X.sql index 925dbf5ec..a34abe722 100644 --- a/script/sql/postgres/postgres_ry_vue_5.X.sql +++ b/script/sql/postgres/postgres_ry_vue_5.X.sql @@ -12,6 +12,7 @@ create table if not exists sys_tenant license_number varchar(30) default null::varchar, address varchar(200) default null::varchar, intro varchar(200) default null::varchar, + domain varchar(200) default null::varchar, remark varchar(200) default null::varchar, package_id int8, expire_time timestamp, @@ -35,6 +36,7 @@ comment on column sys_tenant.company_name is '联系人'; comment on column sys_tenant.license_number is '统一社会信用代码'; comment on column sys_tenant.address is '地址'; comment on column sys_tenant.intro is '企业简介'; +comment on column sys_tenant.domain is '域名'; comment on column sys_tenant.remark is '备注'; comment on column sys_tenant.package_id is '租户套餐编号'; comment on column sys_tenant.expire_time is '过期时间'; @@ -52,7 +54,7 @@ comment on column sys_tenant.update_time is '更新时间'; -- 初始化-租户表数据 -- ---------------------------- -insert into sys_tenant values(1, '000000', '管理组', '15888888888', 'XXX有限公司', null, null, '多租户通用后台管理管理系统', null, null, null, -1, '0', '0', 103, 1, now(), null, null); +insert into sys_tenant values(1, '000000', '管理组', '15888888888', 'XXX有限公司', null, null, '多租户通用后台管理管理系统', null, null, null, null, -1, '0', '0', 103, 1, now(), null, null); -- ---------------------------- diff --git a/script/sql/ry_vue_5.X.sql b/script/sql/ry_vue_5.X.sql index f8bfee26d..c6af29851 100644 --- a/script/sql/ry_vue_5.X.sql +++ b/script/sql/ry_vue_5.X.sql @@ -12,6 +12,7 @@ create table sys_tenant license_number varchar(30) comment '统一社会信用代码', address varchar(200) comment '地址', intro varchar(200) comment '企业简介', + domain varchar(200) comment '域名', remark varchar(200) comment '备注', package_id bigint(20) comment '租户套餐编号', expire_time datetime comment '过期时间', @@ -31,7 +32,7 @@ create table sys_tenant -- 初始化-租户表数据 -- ---------------------------- -insert into sys_tenant values(1, '000000', '管理组', '15888888888', 'XXX有限公司', NULL, NULL, '多租户通用后台管理管理系统', NULL, NULL, NULL, -1, '0', '0', 103, 1, sysdate(), NULL, NULL); +insert into sys_tenant values(1, '000000', '管理组', '15888888888', 'XXX有限公司', NULL, NULL, '多租户通用后台管理管理系统', NULL, NULL, NULL, NULL, -1, '0', '0', 103, 1, sysdate(), NULL, NULL); -- ---------------------------- diff --git a/script/sql/sqlserver/sqlserver_ry_vue_5.X.sql b/script/sql/sqlserver/sqlserver_ry_vue_5.X.sql index b8f4c8000..a4dc8f150 100644 --- a/script/sql/sqlserver/sqlserver_ry_vue_5.X.sql +++ b/script/sql/sqlserver/sqlserver_ry_vue_5.X.sql @@ -8,6 +8,7 @@ CREATE TABLE sys_tenant license_number nvarchar(30) NULL, address nvarchar(200) NULL, intro nvarchar(200) NULL, + domain nvarchar(200) NULL, remark nvarchar(200) NULL, package_id bigint NULL, expire_time datetime2(7) NULL, @@ -74,6 +75,12 @@ EXEC sys.sp_addextendedproperty 'TABLE', N'sys_tenant', 'COLUMN', N'intro' GO +EXEC sys.sp_addextendedproperty + 'MS_Description', N'域名' , + 'SCHEMA', N'dbo', + 'TABLE', N'sys_tenant', + 'COLUMN', N'domain' +GO EXEC sys.sp_addextendedproperty 'MS_Description', N'备注' , 'SCHEMA', N'dbo', @@ -146,7 +153,7 @@ EXEC sys.sp_addextendedproperty 'TABLE', N'sys_tenant' GO -INSERT sys_tenant VALUES (1, N'000000', N'管理组', N'15888888888', N'XXX有限公司', NULL, NULL, N'多租户通用后台管理管理系统', NULL, NULL, NULL, -1, N'0', N'0', 103, 1, getdate(), NULL, NULL) +INSERT sys_tenant VALUES (1, N'000000', N'管理组', N'15888888888', N'XXX有限公司', NULL, NULL, N'多租户通用后台管理管理系统', NULL, NULL, NULL, NULL, -1, N'0', N'0', 103, 1, getdate(), NULL, NULL) GO