增加租户禁用后无法登录功能

user_auth/src/main/java/com/huaxu/controller/UserController.java

@@ -139,9 +139,7 @@ public class UserController {
         ||bytes4!=null){
             return null;
         }
-       /* String authorization = request.getHeader("Authorization");
-        String token =authorization.substring(authorization.indexOf("Bearer")+6).trim();
-        redisUtil.setExpire("auth:"+token,60000);
+        /*redisUtil.setExpire("auth:"+token,60000);
         redisUtil.setExpire("access:"+token,60000);*/
         return principal;
     }

user_auth/src/main/java/com/huaxu/entity/User.java

@@ -100,5 +100,6 @@ public class User implements Serializable {
     private Integer companyOrgState;
     private String token;
     private Integer roleState;
+    private Integer tenantState;
 
 }

user_auth/src/main/java/com/huaxu/service/impl/UserServiceImpl.java

@@ -197,6 +197,7 @@ public class UserServiceImpl implements UserService {
         UserDto userDto=new UserDto();
         userDto.setPhone(user.getPhone());
 
+
        List<ProgramItem>programItems=new ArrayList<>();
 
         Permission permission= findPermission(user);
@@ -207,6 +208,10 @@ public class UserServiceImpl implements UserService {
             returnFlag=true;
 
         }
+        if((user.getTenantState()!=null&&user.getTenantState()==0)){
+            user.setEnableState("0");
+            returnFlag=true;
+        }
         if((user.getCompanyOrgState()!=null&&user.getCompanyOrgState()==0)){
             user.setEnableState("0");
             returnFlag=true;

user_auth/src/main/resources/mapper/UserMapper.xml

@@ -23,6 +23,7 @@
         <result property="webUrl" column="WEB_URL" jdbcType="VARCHAR"/>
         <result property="companyOrgState" column="companyOrgState" jdbcType="INTEGER"/>
         <result property="departmentOrgState" column="departmentOrgState" jdbcType="INTEGER"/>
+        <result property="tenantState" column="TENANT_STATE" jdbcType="INTEGER"/>
     </resultMap>
 
 
@@ -49,7 +50,7 @@
     <!--通过实体作为筛选条件查询-->
     <select id="selectList" resultMap="UserMap">
         select
-        a.*, b.LOGO,b.WEB_URL ,c.ORG_STATE companyOrgState,d.ORG_STATE departmentOrgState
+       b.TENANT_STATE, a.*, b.LOGO,b.WEB_URL ,c.ORG_STATE companyOrgState,d.ORG_STATE departmentOrgState
         from uims_user a join uims_tenant b on a.TENANT_ID=b.CODE
         join uims_org c on a.COMPANY_ORG_ID=c.id left join
         uims_org d on a.DEPT_ORG_ID=d.ID