|
@@ -462,7 +462,6 @@ export function usePublic() {
|
|
|
const findData = (arr1, arr2, key, dot) => {
|
|
|
const msg = _.unionWith(arr1, arr2, _.isEqual)
|
|
|
const res = _.unionBy(msg, key)
|
|
|
- const result: any = []
|
|
|
res.forEach((item) => {
|
|
|
arr2.forEach((p) => {
|
|
|
if (item[key] == p[key]) {
|
|
@@ -470,11 +469,8 @@ export function usePublic() {
|
|
|
}
|
|
|
})
|
|
|
})
|
|
|
- res.forEach((item) => {
|
|
|
- if (item[dot] && item[dot] != undefined) {
|
|
|
- result.push(item)
|
|
|
- }
|
|
|
- })
|
|
|
+ const newArr = res.filter((item) => item['name'])
|
|
|
+ const result = newArr.filter((item) => item[dot] && item[dot] != undefined)
|
|
|
return result
|
|
|
}
|
|
|
return {
|