登录租户不存在报500问题

dsk-admin/src/main/resources/i18n/messages_en_US.properties

@@ -48,7 +48,7 @@ email.code.retry.limit.count=Email code input error {0} times
 email.code.retry.limit.exceed=Email code input error {0} times, account locked for {1} minutes
 xcx.code.not.blank=Mini program code cannot be blank
 ##\u79DF\u6237
-tenant.number.not.blank=company number cannot be blank
-tenant.not.exists=Sorry, your company does not exist. Please contact the administrator
-tenant.blocked=Sorry, your company is disabled. Please contact the administrator
-tenant.expired=Sorry, your company has expired. Please contact the administrator.
\ No newline at end of file
+company.number.not.blank=company number cannot be blank
+company.not.exists=Sorry, your company does not exist. Please contact the administrator
+company.blocked=Sorry, your company is disabled. Please contact the administrator
+company.expired=Sorry, your company has expired. Please contact the administrator.
\ No newline at end of file

dsk-admin/src/main/resources/i18n/messages_zh_CN.properties

@@ -48,7 +48,7 @@ email.code.retry.limit.count=\u90AE\u7BB1\u9A8C\u8BC1\u7801\u8F93\u5165\u9519\u8
 email.code.retry.limit.exceed=\u90AE\u7BB1\u9A8C\u8BC1\u7801\u8F93\u5165\u9519\u8BEF{0}\u6B21\uFF0C\u5E10\u6237\u9501\u5B9A{1}\u5206\u949F
 xcx.code.not.blank=\u5C0F\u7A0B\u5E8Fcode\u4E0D\u80FD\u4E3A\u7A7A
 ##\u79DF\u6237
-tenant.number.not.blank=\u4F01\u4E1A\u7F16\u53F7\u4E0D\u80FD\u4E3A\u7A7A
-tenant.not.exists=\u5BF9\u4E0D\u8D77, \u60A8\u7684\u4F01\u4E1A\u4E0D\u5B58\u5728\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458
-tenant.blocked=\u5BF9\u4E0D\u8D77\uFF0C\u60A8\u7684\u4F01\u4E1A\u5DF2\u7981\u7528\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458
-tenant.expired=\u5BF9\u4E0D\u8D77\uFF0C\u60A8\u7684\u4F01\u4E1A\u5DF2\u8FC7\u671F\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458
\ No newline at end of file
+company.number.not.blank=\u4F01\u4E1A\u7F16\u53F7\u4E0D\u80FD\u4E3A\u7A7A
+company.not.exists=\u5BF9\u4E0D\u8D77, \u60A8\u7684\u4F01\u4E1A\u4E0D\u5B58\u5728\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458
+company.blocked=\u5BF9\u4E0D\u8D77\uFF0C\u60A8\u7684\u4F01\u4E1A\u5DF2\u7981\u7528\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458
+company.expired=\u5BF9\u4E0D\u8D77\uFF0C\u60A8\u7684\u4F01\u4E1A\u5DF2\u8FC7\u671F\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458
\ No newline at end of file

dsk-system/src/main/resources/mapper/system/SysTenantMapper.xml

@@ -6,7 +6,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectTenantList" resultType="com.dsk.system.domain.vo.SysTenantVo">
         select t.id, t.tenant_id,t.company_name from sys_tenant t
-        inner join  sys_user t1 on t1.tenant_id=t.tenant_id
+        inner join  sys_user t1 on t1.tenant_id=t.tenant_id and t1.del_flag=0
         where t.del_flag=0
         and t.status=0
         and t1.phonenumber=#{username}