Merge remote-tracking branch 'origin/dev_2.6.0' into dev_2.6.0

zlmy-modules/zlmy-boot/src/main/java/com/testor/module/iam/controller/IamUserController.java

@@ -77,7 +77,7 @@ public class IamUserController {
     @PostMapping({"/getToken"})
     @Transactional(rollbackFor = Exception.class)
     public BaseResponse<TokenResponse> getToken(@Valid @RequestBody IamLoginDto iamLoginDto){
-        return iamSysUserService.getToken(iamLoginDto);
+        return iamSysUserService. getToken(iamLoginDto);
     }
 
     @ApiOperation(

zlmy-modules/zlmy-boot/src/main/java/com/testor/module/iam/service/impl/IamSysUserServiceImpl.java

@@ -261,6 +261,12 @@ public class IamSysUserServiceImpl extends SuperServiceImpl<IamSysUserDao, IamSy
 
         for (IamUserMapping iamUserMapping : byIamUserId) {
             SysUser byId = sysUserService.getById(iamUserMapping.getUserId());
+            if (Objects.isNull(byId)){
+                continue;
+            }
+            if (!byId.getStatus().equals(StatusEnum.USE.getCode())){
+                continue;
+            }
             //添加验证id
             String uuid = UUID.randomUUID().toString();
             redisTemplate.opsForValue().set(uuid, byId.getUserId(),2, TimeUnit.MINUTES);