|
@@ -307,8 +307,8 @@
|
|
|
for(let i=0;i<response.rows.length;i++){
|
|
|
response.rows[i].lsName = "";
|
|
|
response.rows[i].dqName = "";
|
|
|
- for(let o=0;o<response.rows[i].currentUserList.length;o++){
|
|
|
- if( response.rows[i].currentUserList[o].id == userId){
|
|
|
+ for(let o=0;o<response.rows[i].historyUserList.length;o++){
|
|
|
+ if( response.rows[i].historyUserList[o].id == userId){
|
|
|
if(o == 0){
|
|
|
response.rows[i].lsName = response.rows[i].lsName + '我';
|
|
|
}else{
|
|
@@ -316,14 +316,14 @@
|
|
|
}
|
|
|
}else{
|
|
|
if(o == 0){
|
|
|
- response.rows[i].lsName = response.rows[i].lsName + response.rows[i].currentUserList[o].name;
|
|
|
+ response.rows[i].lsName = response.rows[i].lsName + response.rows[i].historyUserList[o].name;
|
|
|
}else{
|
|
|
- response.rows[i].lsName = response.rows[i].lsName + '、' + response.rows[i].currentUserList[o].name;
|
|
|
+ response.rows[i].lsName = response.rows[i].lsName + '、' + response.rows[i].historyUserList[o].name;
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- for(let o=0;o<response.rows[i].historyUserList.length;o++){
|
|
|
- if( response.rows[i].historyUserList[o].id == userId){
|
|
|
+ for(let o=0;o<response.rows[i].currentUserList.length;o++){
|
|
|
+ if( response.rows[i].currentUserList[o].id == userId){
|
|
|
if(o == 0){
|
|
|
response.rows[i].dqName = response.rows[i].dqName + '我';
|
|
|
}else{
|
|
@@ -331,9 +331,9 @@
|
|
|
}
|
|
|
}else{
|
|
|
if(o == 0){
|
|
|
- response.rows[i].dqName = response.rows[i].dqName + response.rows[i].historyUserList[o].name;
|
|
|
+ response.rows[i].dqName = response.rows[i].dqName + response.rows[i].currentUserList[o].name;
|
|
|
}else{
|
|
|
- response.rows[i].dqName = response.rows[i].dqName + '、'+ response.rows[i].historyUserList[o].name;
|
|
|
+ response.rows[i].dqName = response.rows[i].dqName + '、'+ response.rows[i].currentUserList[o].name;
|
|
|
}
|
|
|
}
|
|
|
|