处理总部框架组织结构数据权限
This commit is contained in:
parent
ea850a0ffc
commit
29515dab9d
@ -109,6 +109,7 @@ export function getRequestHeaders(url, type = 'post', data, isIgnoreTenant) {
|
|||||||
if (Tenant && Tenant == '003' && data && data.Parameter22 && data.Parameter22.length > 20) {
|
if (Tenant && Tenant == '003' && data && data.Parameter22 && data.Parameter22.length > 20) {
|
||||||
//总公司 Parameter22 存入子公司的ORG_ID 自动切换数据库链接
|
//总公司 Parameter22 存入子公司的ORG_ID 自动切换数据库链接
|
||||||
headers.Tenant = data.Parameter22.substring(0, 3)
|
headers.Tenant = data.Parameter22.substring(0, 3)
|
||||||
|
data.IgnoreDataRule = true
|
||||||
}
|
}
|
||||||
|
|
||||||
return headers
|
return headers
|
||||||
@ -130,17 +131,20 @@ export function httpPost(url, data, onlyData = true, ignoreThrottle, onException
|
|||||||
// 与 isIgnoreTenant 相关配套的逻辑
|
// 与 isIgnoreTenant 相关配套的逻辑
|
||||||
const extraData = isIgnoreTenant ? { OrgId: '', IgnoreOrgRule: true } : {}
|
const extraData = isIgnoreTenant ? { OrgId: '', IgnoreOrgRule: true } : {}
|
||||||
//const dataStr = JSON.stringify(Object.assign({}, data, { DataRule, OrgRule, ...extraData }))
|
//const dataStr = JSON.stringify(Object.assign({}, data, { DataRule, OrgRule, ...extraData }))
|
||||||
|
var headers = getRequestHeaders(url, 'post', data, isIgnoreTenant)
|
||||||
|
if (headers.Tenant == '003') {
|
||||||
|
data.IgnoreDataRule = true
|
||||||
|
}
|
||||||
const dataStr = JSON.stringify(Object.assign({}, data, { OrgRule, ...extraData }))
|
const dataStr = JSON.stringify(Object.assign({}, data, { OrgRule, ...extraData }))
|
||||||
// 请求节流
|
// 请求节流
|
||||||
const requestKey = url + '_' + MD5(dataStr) + '_requestKey'
|
const requestKey = url + '_' + MD5(dataStr) + '_requestKey'
|
||||||
const loaded = storage('lacal').getItem(requestKey).val
|
const loaded = storage('lacal').getItem(requestKey).val
|
||||||
if (loaded && !ignoreThrottle) return null
|
if (loaded && !ignoreThrottle) return null
|
||||||
storage('lacal').setItem(requestKey, true)
|
storage('lacal').setItem(requestKey, true)
|
||||||
|
|
||||||
// 发起请求
|
// 发起请求
|
||||||
return request(url, {
|
return request(url, {
|
||||||
method: 'POST',
|
method: 'POST',
|
||||||
headers: getRequestHeaders(url, 'post', data, isIgnoreTenant),
|
headers: headers,// getRequestHeaders(url, 'post', data, isIgnoreTenant),
|
||||||
body: dataStr,
|
body: dataStr,
|
||||||
}, onlyData, requestKey, onException)
|
}, onlyData, requestKey, onException)
|
||||||
}
|
}
|
||||||
@ -158,8 +162,12 @@ export function httpGet(url, data, onlyData = true, onException) {
|
|||||||
const searchMark = url.indexOf('?') !== -1
|
const searchMark = url.indexOf('?') !== -1
|
||||||
const formUrl = `${url}${searchMark ? '&' : '?'}${formParams}`
|
const formUrl = `${url}${searchMark ? '&' : '?'}${formParams}`
|
||||||
url = formParams ? formUrl : url
|
url = formParams ? formUrl : url
|
||||||
|
var headers = getRequestHeaders(url, 'get', data)
|
||||||
|
if (headers.Tenant == '003') {
|
||||||
|
data.IgnoreDataRule = true
|
||||||
|
}
|
||||||
return request(url, {
|
return request(url, {
|
||||||
method: 'GET',
|
method: 'GET',
|
||||||
headers: getRequestHeaders(url, 'get', data),
|
headers: headers,// getRequestHeaders(url, 'get', data),
|
||||||
}, onlyData, null, onException)
|
}, onlyData, null, onException)
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user