diff --git a/app/src/main/resources/sql/mysql/01_create_all_tables_ddl_v1.0.0.mysql.sql b/app/src/main/resources/sql/mysql/01_create_all_tables_ddl_v1.0.0.mysql.sql index c4f9a87b..d96a665f 100644 --- a/app/src/main/resources/sql/mysql/01_create_all_tables_ddl_v1.0.0.mysql.sql +++ b/app/src/main/resources/sql/mysql/01_create_all_tables_ddl_v1.0.0.mysql.sql @@ -581,7 +581,7 @@ create table `t_tenant` `id` int not null auto_increment comment '主键id', `org_code` varchar(255) comment '组织唯一代码', `name_cn` varchar(255) not null comment '组织中文名', - `name_en` varchar(255) comment '组织英文名', + `name_en` varchar(255) comment '组织英文名', `description` varchar(2000) comment '组织描述', `created_by` varchar(60) not null comment '创建人', `created_time` timestamp not null default current_timestamp comment '创建时间', diff --git a/base/src/main/java/com/tinyengine/it/login/utils/JwtUtil.java b/base/src/main/java/com/tinyengine/it/login/utils/JwtUtil.java index ab7a3ed2..42f7ed03 100644 --- a/base/src/main/java/com/tinyengine/it/login/utils/JwtUtil.java +++ b/base/src/main/java/com/tinyengine/it/login/utils/JwtUtil.java @@ -116,6 +116,7 @@ private List> convertTenantsToSimpleMap(List tenants simple.put("description", tenant.getDescription()); simple.put("createdBy", tenant.getCreatedBy()); simple.put("lastUpdatedBy", tenant.getLastUpdatedBy()); + simple.put("isInUse", tenant.getIsInUse()); // 不传递日期字段,避免序列化问题 return simple; }).collect(Collectors.toList()); @@ -182,6 +183,7 @@ public List getTenantIdFromToken(String token) { tenant.setDescription((String) map.get("description")); tenant.setCreatedBy((String) map.get("createdBy")); tenant.setLastUpdatedBy((String) map.get("lastUpdatedBy")); + tenant.setIsInUse((Boolean) map.get("isInUse")); return tenant; }).collect(Collectors.toList()); } diff --git a/base/src/main/java/com/tinyengine/it/service/app/impl/v1/AppV1ServiceImpl.java b/base/src/main/java/com/tinyengine/it/service/app/impl/v1/AppV1ServiceImpl.java index c2bf340d..bece80d1 100644 --- a/base/src/main/java/com/tinyengine/it/service/app/impl/v1/AppV1ServiceImpl.java +++ b/base/src/main/java/com/tinyengine/it/service/app/impl/v1/AppV1ServiceImpl.java @@ -17,6 +17,7 @@ import com.fasterxml.jackson.core.type.TypeReference; import com.tinyengine.it.common.context.LoginUserContext; +import com.tinyengine.it.common.exception.ExceptionEnum; import com.tinyengine.it.common.exception.ServiceException; import com.tinyengine.it.common.log.SystemServiceLog; import com.tinyengine.it.common.utils.Schema; @@ -280,7 +281,9 @@ private List getPackages() { */ public MetaDto getMetaDto(Integer id) { App app = appMapper.queryAppById(id, loginUserContext.getTenantId()); - + if (app == null) { + throw new ServiceException(ExceptionEnum.CM009.getResultCode(), ExceptionEnum.CM009.getResultMsg()); + } Platform platform = platformService.queryPlatformById(app.getPlatformId()); // 当前版本暂无设计器数据