fix: modify login set tenant

Author: lu-yg

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

@@ -580,8 +580,8 @@ create table `t_tenant`
 (
     `id`                int          not null auto_increment comment '主键id',
     `org_code`          varchar(255) comment '组织唯一代码',
-    `name_cn`           varchar(255)  comment '组织中文名',
-    `name_en`           varchar(255) not nullcomment '组织英文名',
+    `name_cn`           varchar(255) not null 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 '创建时间',

base/src/main/java/com/tinyengine/it/service/platform/impl/TenantServiceImpl.java

@@ -114,7 +114,7 @@ public Integer updateTenantById(Tenant tenant) {
     @Override
     public Integer createTenant(Tenant tenant) {
         QueryWrapper<Tenant> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("name_cn", tenant.getNameCn());
+        queryWrapper.eq("name_en", tenant.getNameEn());
         Tenant tenantResult = this.baseMapper.selectOne(queryWrapper);
         if (tenantResult != null) {
             throw new ServiceException(ExceptionEnum.CM003.getResultCode(), ExceptionEnum.CM003.getResultMsg());

base/src/test/java/com/tinyengine/it/service/app/impl/AppServiceImplTest.java

@@ -19,13 +19,7 @@
 
 import cn.hutool.core.util.ReflectUtil;
 import com.tinyengine.it.common.base.Result;
-<<<<<<< HEAD
-import com.tinyengine.it.common.context.LoginUserContext;
 import com.tinyengine.it.common.handler.MockUserContext;
-import com.tinyengine.it.common.utils.TestUtil;
-=======
-import com.tinyengine.it.common.handler.MockUserContext;
->>>>>>> 0f2ef7ba169f4c502dea62846f23b11ce5f82c55
 import com.tinyengine.it.mapper.AppMapper;
 import com.tinyengine.it.mapper.I18nEntryMapper;
 import com.tinyengine.it.model.dto.I18nEntryDto;