去除租户表 Username字段

tuoheng-admin/src/main/java/com/tuoheng/admin/dto/TenantDto.java

@@ -88,11 +88,6 @@ public class TenantDto {
      */
     private Integer sort;
 
-    /**
-     * 登录账号
-     */
-    private String username;
-
     /**
      * 登录密码
      */

tuoheng-admin/src/main/java/com/tuoheng/admin/entity/Tenant.java

@@ -100,9 +100,4 @@ public class Tenant extends BaseEntity {
      */
     private Integer sort;
 
-    /**
-     * 租户超管账号
-     */
-    private String username;
-
 }

tuoheng-admin/src/main/java/com/tuoheng/admin/service/impl/TenantServiceImpl.java

@@ -83,12 +83,12 @@ public class TenantServiceImpl extends BaseServiceImpl<TenantMapper, Tenant> imp
         }
 
         // 验证租户超管账号是否存在
-        Integer count2 = tenantMapper.selectCount(new LambdaQueryWrapper<Tenant>()
-                .eq(Tenant::getUsername, tenantDto.getUsername())
-                .eq(Tenant::getMark, 1));
-        if (count2 > 0) {
-            return JsonResult.error("系统中已经存在相同的租户账号");
-        }
+//        Integer count2 = tenantMapper.selectCount(new LambdaQueryWrapper<Tenant>()
+//                .eq(Tenant::getUsername, tenantDto.getUsername())
+//                .eq(Tenant::getMark, 1));
+//        if (count2 > 0) {
+//            return JsonResult.error("系统中已经存在相同的租户账号");
+//        }
 
         // 参数转换
         Tenant tenant = new Tenant();
@@ -107,14 +107,14 @@ public class TenantServiceImpl extends BaseServiceImpl<TenantMapper, Tenant> imp
             return JsonResult.error("租户创建失败");
         }
 
-        // 创建租户账号
-        Map<String, String> accountMap = new HashMap<>();
-        accountMap.put("tenant_id", tenant.getId().toString());
-        accountMap.put("tenant_name", tenant.getName());
-        accountMap.put("username", tenantDto.getUsername());
-        accountMap.put("password", tenantDto.getPassword());
-        // 添加
-        accountMap.put("type", "1");
+//        // 创建租户账号
+//        Map<String, String> accountMap = new HashMap<>();
+//        accountMap.put("tenant_id", tenant.getId().toString());
+//        accountMap.put("tenant_name", tenant.getName());
+//        accountMap.put("username", tenantDto.getUsername());
+//        accountMap.put("password", tenantDto.getPassword());
+//        // 添加
+//        accountMap.put("type", "1");
 
         // 调用网络请求处理租户账号信息
 //        String result = handleTenantAccount(accountMap);
@@ -147,13 +147,13 @@ public class TenantServiceImpl extends BaseServiceImpl<TenantMapper, Tenant> imp
         }
 
         // 验证租户账号
-        Integer count2 = tenantMapper.selectCount(new LambdaQueryWrapper<Tenant>()
-                .ne(Tenant::getId, tenant.getId())
-                .eq(Tenant::getUsername, tenantDto.getUsername())
-                .eq(Tenant::getMark, 1));
-        if (count2 > 0) {
-            return JsonResult.error("系统中已经存在相同的租户账号");
-        }
+//        Integer count2 = tenantMapper.selectCount(new LambdaQueryWrapper<Tenant>()
+//                .ne(Tenant::getId, tenant.getId())
+//                .eq(Tenant::getUsername, tenantDto.getUsername())
+//                .eq(Tenant::getMark, 1));
+//        if (count2 > 0) {
+//            return JsonResult.error("系统中已经存在相同的租户账号");
+//        }
 
         BeanUtils.copyProperties(tenantDto, tenant);
         tenant.setUpdateUser(ShiroUtils.getUserId());
@@ -168,14 +168,14 @@ public class TenantServiceImpl extends BaseServiceImpl<TenantMapper, Tenant> imp
             return JsonResult.error("更新租户信息失败");
         }
 
-        // 更新租户账号
-        Map<String, String> accountMap = new HashMap<>();
-        accountMap.put("tenant_id", tenant.getId().toString());
-        accountMap.put("tenant_name", tenant.getName());
-        accountMap.put("username", tenantDto.getUsername());
-        accountMap.put("password", tenantDto.getPassword());
-        // 更新
-        accountMap.put("type", "2");
+//        // 更新租户账号
+//        Map<String, String> accountMap = new HashMap<>();
+//        accountMap.put("tenant_id", tenant.getId().toString());
+//        accountMap.put("tenant_name", tenant.getName());
+//        accountMap.put("username", tenantDto.getUsername());
+//        accountMap.put("password", tenantDto.getPassword());
+//        // 更新
+//        accountMap.put("type", "2");
 
         // 调用网络请求处理租户账号信息
 //        String result = handleTenantAccount(accountMap);