Showing
1 changed file
with
2 additions
and
1 deletions
... | ... | @@ -9,7 +9,8 @@ |
9 | 9 | LEFT JOIN sys_user sus ON base.app_user_id = sus.id |
10 | 10 | LEFT JOIN sys_tenant ste ON ste.tenant_id = sus.tenant_id |
11 | 11 | <where> |
12 | - sus.account_expire_time > CURRENT_TIMESTAMP and ste.tenant_expire_time > CURRENT_TIMESTAMP | |
12 | + (sus.account_expire_time > CURRENT_TIMESTAMP OR sus.account_expire_time IS NULL) | |
13 | + AND (ste.tenant_expire_time > CURRENT_TIMESTAMP OR ste.tenant_expire_time IS NULL) | |
13 | 14 | <if test="thirdId !=null and thirdId !=''"> |
14 | 15 | AND base.third_user_id = #{thirdId} |
15 | 16 | </if> | ... | ... |