|
@@ -38,6 +38,17 @@ function getDepUserTree(data) {
|
|
return data;
|
|
return data;
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+function getDepTreeData(data) {
|
|
|
|
+ data.title = `${data.Name}`;
|
|
|
|
+ data.key = data.ID;
|
|
|
|
+ data.value = data.ID;
|
|
|
|
+ if (data.children) {
|
|
|
|
+ data.children.forEach(item => {
|
|
|
|
+ getDepTreeData(item, false);
|
|
|
|
+ });
|
|
|
|
+ }
|
|
|
|
+ return data;
|
|
|
|
+}
|
|
const getRoleList = data => {
|
|
const getRoleList = data => {
|
|
let roleList = [];
|
|
let roleList = [];
|
|
(data || []).forEach(dep => {
|
|
(data || []).forEach(dep => {
|
|
@@ -63,6 +74,7 @@ export default {
|
|
depRole: [],
|
|
depRole: [],
|
|
depUserTree: [],
|
|
depUserTree: [],
|
|
roleList: [],
|
|
roleList: [],
|
|
|
|
+ depTrees: [],
|
|
},
|
|
},
|
|
|
|
|
|
effects: {
|
|
effects: {
|
|
@@ -167,12 +179,16 @@ export default {
|
|
*fetchDepV2({ payload, callback }, { call, put }) {
|
|
*fetchDepV2({ payload, callback }, { call, put }) {
|
|
const response = yield call(queryDepV2, { pageSize: 999999 });
|
|
const response = yield call(queryDepV2, { pageSize: 999999 });
|
|
if (response) {
|
|
if (response) {
|
|
|
|
+ let temp = JSON.parse(JSON.stringify(response.data.list));
|
|
const depUserTree = response.data.list.map(item => {
|
|
const depUserTree = response.data.list.map(item => {
|
|
return getDepUserTree(item);
|
|
return getDepUserTree(item);
|
|
});
|
|
});
|
|
|
|
+ const depTrees = temp.map(item => {
|
|
|
|
+ return getDepTreeData(item);
|
|
|
|
+ });
|
|
yield put({
|
|
yield put({
|
|
type: 'saveState',
|
|
type: 'saveState',
|
|
- payload: { depUserTree },
|
|
|
|
|
|
+ payload: { depUserTree, depTrees },
|
|
});
|
|
});
|
|
}
|
|
}
|
|
},
|
|
},
|