Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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 '创建时间',
Expand Down
2 changes: 2 additions & 0 deletions base/src/main/java/com/tinyengine/it/login/utils/JwtUtil.java
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@ private List<Map<String, Object>> convertTenantsToSimpleMap(List<Tenant> 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());
Expand Down Expand Up @@ -182,6 +183,7 @@ public List<Tenant> 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());
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -280,7 +281,9 @@ private List<PackagesDto> 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());

// 当前版本暂无设计器数据
Expand Down
Loading