From 7fc578dc2032fac935267e92208f7f11384e3800 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期四, 28 十一月 2024 08:36:36 +0800
Subject: [PATCH] 修改了相关bug
---
ruoyi-ui/src/views/index.vue | 22 +++++++++++++++-------
1 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/ruoyi-ui/src/views/index.vue b/ruoyi-ui/src/views/index.vue
index 97d95f2..568adcb 100644
--- a/ruoyi-ui/src/views/index.vue
+++ b/ruoyi-ui/src/views/index.vue
@@ -78,8 +78,12 @@
getUserProfile().then(response => {
this.user = response.data;
});
+
let clanId = this.$store.state.user.clanId
- // alert(clanId)
+ if(clanId==null)
+ {
+ //alert(clanId)
+ return}
listRoot(10,clanId).then(response =>{
this.rootList =response.data;
@@ -98,24 +102,28 @@
if (mpdata == null)
return null;
var data = {
- "label": mpdata['spouse'] != null ? eval(mpdata['spouse']).nickName : '',
- "prop": mpdata['nickName'],
+ "label": mpdata['spouse'] != null ? eval(mpdata['spouse']).oldName : '',
+ "prop": mpdata['oldName'],
"url": mpdata['url']!=null?'https://www.bendudu.com:8080/'+mpdata['url']:tp,
"purl": mpdata['spouse'] != null ? (mpdata['spouse'].url!=null? 'https://www.bendudu.com:8080/'+mpdata['spouse'].url:tp):tp,
"id": mpdata['userId'],
- "link": mpdata['nickName'],
+ "spid": mpdata['spouseId'] != null ? mpdata['spouseId'] : '',
+
+ "link": mpdata['oldName'],
"children": []
};
if (mpdata['childList'] != null) {
for (var i = 0; i < mpdata['childList'].length; i++) {
var dt = {
- "label": mpdata['childList'][i]['spouse'] != null ? eval(mpdata['childList'][i]['spouse']).nickName : "",
- "prop": mpdata['childList'][i]['nickName'],
+ "label": mpdata['childList'][i]['spouse'] != null ? eval(mpdata['childList'][i]['spouse']).oldName : "",
+ "prop": mpdata['childList'][i]['oldName'],
"url": mpdata['childList'][i]['url']!=null?'https://www.bendudu.com:8080/'+mpdata['childList'][i]['url']:tp,
"id": mpdata['childList'][i]['userId'],
+ "spid": mpdata['childList'][i]['spouseId'] != null ? mpdata['childList'][i]['spouseId'] : '',
+
"purl": (mpdata['childList'][i]['spouse'] != null ) ?( mpdata['childList'][i]['spouse'].url!= null?'https://www.bendudu.com:8080/'+mpdata['childList'][i]['spouse'].url:tp):tp,
- "link": mpdata['childList'][i]['nickName'],
+ "link": mpdata['childList'][i]['oldName'],
"children": []
};
if (mpdata['childList'][i]['childList'] != null) {
--
Gitblit v1.9.1