From 3eaa238618d3769aafddc61aa77d314054f8f885 Mon Sep 17 00:00:00 2001
From: congmu <congmu2024@163.com>
Date: 星期二, 05 十一月 2024 15:00:51 +0800
Subject: [PATCH] Merge branch 'master' of ssh://115.28.86.8:29418/~admin/昆仑_1025
---
Client/姜可庚/code/2024kunlun_project_permisson/PmsClientSocket.cpp | 13 ++++---------
1 files changed, 4 insertions(+), 9 deletions(-)
diff --git "a/Client/\345\247\234\345\217\257\345\272\232/code/2024kunlun_project_permisson/PmsClientSocket.cpp" "b/Client/\345\247\234\345\217\257\345\272\232/code/2024kunlun_project_permisson/PmsClientSocket.cpp"
index 7a533e6..8449947 100644
--- "a/Client/\345\247\234\345\217\257\345\272\232/code/2024kunlun_project_permisson/PmsClientSocket.cpp"
+++ "b/Client/\345\247\234\345\217\257\345\272\232/code/2024kunlun_project_permisson/PmsClientSocket.cpp"
@@ -68,10 +68,9 @@
res = (QueryPmsResponse *)buf.data();
if(res->success){
vector<PmsQueryResult> vecs;
-
- for(int i =0;i<100;i++){
- PmsRes structRes =res->pmsList[i];
- if(*(int *)&structRes){
+ int pmsLen = res->head.len-sizeof(QueryPmsResponse);
+ for(int i =0;i<pmsLen;i+=sizeof(PmsRes)){
+ PmsRes structRes = *(PmsRes*)(res + sizeof(QueryPmsResponse) + i*sizeof(PmsRes));
PmsQueryResult res;
res.setName(string(structRes.name));
res.setUserNo(string(structRes.userNo));
@@ -83,12 +82,8 @@
res.setDevManage(structRes.devManage);
res.setProductPlan(structRes.productPlan);
res.setQueryHistory(structRes.queryHistory);
-
res.setPermissonType(string(structRes.permissonType));
-
vecs.push_back(res);
-
- }else break;
}
if(!vecs.empty()){
emit notifyDateChange(vecs);
@@ -103,7 +98,7 @@
QMessageBox::information(this,dlgTitle,strInfo,
QMessageBox::Ok, QMessageBox::NoButton);
}else{
-// QMessageBox::warning(this, "鏇存柊缁撴灉", "鏉冮檺淇℃伅鏇存柊澶辫触");
+ QMessageBox::warning(this, "鏇存柊缁撴灉", "鏉冮檺淇℃伅鏇存柊澶辫触");
}
}
}
--
Gitblit v1.8.0