Merge branch 'main' into dev-2.4
This commit is contained in:
commit
76a7bcbb19
@ -206,9 +206,7 @@ async function getCustomers() {
|
||||
}
|
||||
|
||||
async function getResponsiblePerson() {
|
||||
if (!externalUserId.value) {
|
||||
await getExternalUserId(props.corpId)
|
||||
}
|
||||
const corpUserId = props.corpUserIds && props.corpUserIds[props.team.teamId] ? props.corpUserIds[props.team.teamId] : "";
|
||||
const res = await api('getResponsiblePerson', { corpId: props.corpId, teamId: props.team.teamId, corpUserId, externalUserId: externalUserId.value });
|
||||
return res && res.data ? res.data : ''
|
||||
|
||||
@ -141,11 +141,10 @@ export default defineStore("accountStore", () => {
|
||||
async function getExternalUserId(corpId) {
|
||||
const unionid = account.value?.unionid;
|
||||
const openid = account.value?.openid;
|
||||
if (!(corpId && unionid && openid) || externalUserId.value) return;
|
||||
if (!(corpId && unionid && openid)) return;
|
||||
const res = await api('getUnionidToExternalUserid', { unionid, openid, corpId }, false);
|
||||
if (res && res.success && typeof res.data === 'string' && res.data.trim()) {
|
||||
externalUserId.value = res.data.trim();
|
||||
}
|
||||
const id = res && res.success && typeof res.data === 'string' && res.data.trim() ? res.data.trim() : '';
|
||||
externalUserId.value = id;
|
||||
}
|
||||
|
||||
watch(hasImCorpId, n => {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user