Skip to content

Commit 4191663

Browse files
authored
fix: modify login set tenant (opentiny#286)
* fix: modify resource upload * fix: modify resource upload * fix: modify resource upload * fix: modify resource upload * fix: modify app API * fix: modify app API * fix: modify tenant API * fix: modify tenant API * fix: modify tenant API * fix: modify tenant API * fix: modify tenant API * fix: modify tenant API * fix: modify tenant API * fix: modify tenant API * fix: modify login set tenant * fix: modify login set tenant * fix: modify login set tenant
1 parent 0f2ef7b commit 4191663

File tree

3 files changed

+7
-2
lines changed

3 files changed

+7
-2
lines changed

app/src/main/resources/sql/mysql/01_create_all_tables_ddl_v1.0.0.mysql.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -581,7 +581,7 @@ create table `t_tenant`
581581
`id` int not null auto_increment comment '主键id',
582582
`org_code` varchar(255) comment '组织唯一代码',
583583
`name_cn` varchar(255) not null comment '组织中文名',
584-
`name_en` varchar(255) comment '组织英文名',
584+
`name_en` varchar(255) comment '组织英文名',
585585
`description` varchar(2000) comment '组织描述',
586586
`created_by` varchar(60) not null comment '创建人',
587587
`created_time` timestamp not null default current_timestamp comment '创建时间',

base/src/main/java/com/tinyengine/it/login/utils/JwtUtil.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,7 @@ private List<Map<String, Object>> convertTenantsToSimpleMap(List<Tenant> tenants
116116
simple.put("description", tenant.getDescription());
117117
simple.put("createdBy", tenant.getCreatedBy());
118118
simple.put("lastUpdatedBy", tenant.getLastUpdatedBy());
119+
simple.put("isInUse", tenant.getIsInUse());
119120
// 不传递日期字段,避免序列化问题
120121
return simple;
121122
}).collect(Collectors.toList());
@@ -182,6 +183,7 @@ public List<Tenant> getTenantIdFromToken(String token) {
182183
tenant.setDescription((String) map.get("description"));
183184
tenant.setCreatedBy((String) map.get("createdBy"));
184185
tenant.setLastUpdatedBy((String) map.get("lastUpdatedBy"));
186+
tenant.setIsInUse((Boolean) map.get("isInUse"));
185187
return tenant;
186188
}).collect(Collectors.toList());
187189
}

base/src/main/java/com/tinyengine/it/service/app/impl/v1/AppV1ServiceImpl.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
import com.fasterxml.jackson.core.type.TypeReference;
1919
import com.tinyengine.it.common.context.LoginUserContext;
20+
import com.tinyengine.it.common.exception.ExceptionEnum;
2021
import com.tinyengine.it.common.exception.ServiceException;
2122
import com.tinyengine.it.common.log.SystemServiceLog;
2223
import com.tinyengine.it.common.utils.Schema;
@@ -280,7 +281,9 @@ private List<PackagesDto> getPackages() {
280281
*/
281282
public MetaDto getMetaDto(Integer id) {
282283
App app = appMapper.queryAppById(id, loginUserContext.getTenantId());
283-
284+
if (app == null) {
285+
throw new ServiceException(ExceptionEnum.CM009.getResultCode(), ExceptionEnum.CM009.getResultMsg());
286+
}
284287
Platform platform = platformService.queryPlatformById(app.getPlatformId());
285288

286289
// 当前版本暂无设计器数据

0 commit comments

Comments
 (0)