fix(mobile): 添加租户列表接口+修复医院选择为空
This commit is contained in:
@@ -37,7 +37,8 @@ service.interceptors.response.use(
|
||||
|
||||
export const authApi = {
|
||||
login: (data) => service.post('/login', data, { headers: { isToken: false } }),
|
||||
getTenants: (username) => service.get('/system/tenant/user-bind/' + (username || ''), { headers: { isToken: false } }),
|
||||
getTenants: () => service.get('/system/tenant/all-active', { headers: { isToken: false } }),
|
||||
getUserTenants: (username) => service.get('/system/tenant/user-bind/' + username, { headers: { isToken: false } }),
|
||||
getInfo: () => service.get('/getInfo')
|
||||
}
|
||||
|
||||
|
||||
@@ -42,9 +42,9 @@ const form = ref({ username: '', password: '', tenantId: '' })
|
||||
|
||||
const loadTenants = async () => {
|
||||
try {
|
||||
const res = await authApi.getTenants('')
|
||||
const res = await authApi.getTenants()
|
||||
if (res.code === 200 && res.data) {
|
||||
tenantOptions.value = res.data.map(item => ({ label: item.tenantName, value: item.id }))
|
||||
tenantOptions.value = res.data.map(item => ({ label: item.tenantName, value: item.tenantId || item.id }))
|
||||
const savedTenantId = localStorage.getItem('selectedTenantId')
|
||||
const savedTenantName = localStorage.getItem('selectedTenantName')
|
||||
if (savedTenantId && tenantOptions.value.some(t => t.value == savedTenantId)) {
|
||||
|
||||
@@ -194,4 +194,19 @@ public class SysTenantController extends BaseController {
|
||||
public R<List<SysTenant>> getUserBindTenantList(@PathVariable String username) {
|
||||
return sysTenantService.getUserBindTenantList(username);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询所有可用租户列表(登录页使用,无需认证)
|
||||
*
|
||||
* @return 所有启用的租户列表
|
||||
*/
|
||||
@Anonymous
|
||||
@GetMapping("/all-active")
|
||||
public R<List<SysTenant>> getAllActiveTenants() {
|
||||
LambdaQueryWrapper<SysTenant> wrapper = new LambdaQueryWrapper<>();
|
||||
wrapper.eq(SysTenant::getStatus, "0");
|
||||
wrapper.eq(SysTenant::getDelFlag, "0");
|
||||
wrapper.orderByAsc(SysTenant::getTenantId);
|
||||
return R.ok(sysTenantService.list(wrapper));
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user