1.登录校验机构停用

cooleshow-api/src/main/java/com/yonge/cooleshow/api/feign/dto/TenantWrapper.java

@@ -2,6 +2,7 @@ package com.yonge.cooleshow.api.feign.dto;
 
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.yonge.cooleshow.common.enums.UserLockFlag;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -113,6 +114,8 @@ public class TenantWrapper implements Serializable {
         public static Staff from(String json) {
             return JSON.parseObject(json, Staff.class);
         }
+
+
     }
 
 }

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/core/provider/service/DefaultUserDetailsService.java

@@ -93,10 +93,10 @@ public class DefaultUserDetailsService implements UserDetailsService {
             if (tenantStaff == null) {
                 throw new UsernameNotFoundException("账户不存在");
             }
+            if (Boolean.FALSE.equals(tenantStaff.getTenantEnableFlag())) {
+                throw new UsernameNotFoundException("MA:5004:该机构已被冻结");
+            }
             if (UserLockFlag.LOCKED.name().equals(tenantStaff.getStatus())) {
-                if (Boolean.FALSE.equals(tenantStaff.getTenantEnableFlag())) {
-                    throw new UsernameNotFoundException("MA:5004:该机构已被冻结");
-                }
                 throw new LockedException("账户被锁定");
             }
         }

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/open/AdminClient.java

@@ -177,6 +177,7 @@ public class AdminClient extends BaseController {
         TenantStaff staff = tenantStaffService.getByUserId(userId);
         if (Objects.nonNull(staff)) {
             ret = TenantWrapper.Staff.from(JSON.toJSONString(staff));
+            ret.setStatus(staff.getStatus().name());
             Long tenantId = staff.getTenantId();
             TenantInfo tenantInfo = tenantInfoService.getById(Optional.ofNullable(tenantId).orElse(-1L));
             ret.setTenantEnableFlag(Optional.ofNullable(tenantInfo).map(TenantInfo::getEnableFlag).orElse(false));