fix(aihr): prefer dynamic tenant for upload queue
This commit is contained in:
+1
-2
@@ -6,7 +6,6 @@ import org.dromara.aihr.domain.AihrSopDto.UploadEnqueueResponse;
|
||||
import org.dromara.aihr.domain.AihrSopDto.UploadItemResponse;
|
||||
import org.dromara.aihr.domain.AihrSopDto.UploadResponse;
|
||||
import org.dromara.common.core.exception.ServiceException;
|
||||
import org.dromara.common.satoken.utils.LoginHelper;
|
||||
import org.dromara.common.tenant.helper.TenantHelper;
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
import org.springframework.dao.DataAccessException;
|
||||
@@ -498,7 +497,7 @@ public class AihrUploadQueueService {
|
||||
}
|
||||
|
||||
private String currentTenantId() {
|
||||
String tenantId = LoginHelper.getTenantId();
|
||||
String tenantId = TenantHelper.getTenantId();
|
||||
return tenantId == null || tenantId.isBlank() ? TENANT_ID : tenantId;
|
||||
}
|
||||
|
||||
|
||||
+1
@@ -22,6 +22,7 @@ class AihrUploadQueueServiceTest {
|
||||
|
||||
assertTrue(code.contains("select i.tenant_id, i.id, i.file_name"));
|
||||
assertTrue(code.contains("p.tenant_id = i.tenant_id"));
|
||||
assertTrue(code.contains("TenantHelper.getTenantId()"));
|
||||
assertTrue(code.contains("TenantHelper.dynamic(tenantId"));
|
||||
assertTrue(code.contains("new ItemRow(rs.getString(\"tenant_id\")"));
|
||||
assertTrue(code.contains("where status = 1\n and ("));
|
||||
|
||||
Reference in New Issue
Block a user