hanshuang
/
QinGang_interested
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

代码冲突修改

master
hs 2026-05-22 09:04:29 +08:00
parent 092a5701dd
commit e8e22205f3
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/pages/home/home_page.dart
View File

@ -1120,7 +1120,7 @@ class HomePageState extends RouteAwareState<HomePage>
int keyTasksNum = 0; int keyTasksNum = 0;
int hiddenDangerNum = 0; int hiddenDangerNum = 0;
try { try {
if (specialWork['success']) { if (FormUtils.hasValue(specialWork, 'success') && specialWork['success']) {
List<dynamic> specialWorkList = specialWork['data'] ?? []; List<dynamic> specialWorkList = specialWork['data'] ?? [];
for (var item in specialWorkList) { for (var item in specialWorkList) {
if (item is Map) { if (item is Map) {
@ -1129,14 +1129,14 @@ class HomePageState extends RouteAwareState<HomePage>
} }
} }
} }
if (keyTasksWork['success']) { if (FormUtils.hasValue(keyTasksWork, 'success') && keyTasksWork['success']) {
int zdzysqCount = int.parse(keyTasksWork['data']['zdzysqCount']??0); int zdzysqCount = int.parse(keyTasksWork['data']['zdzysqCount']??0);
int bjcrqrCount = int.parse(keyTasksWork['data']['bjcrqrCount']??0); int bjcrqrCount = int.parse(keyTasksWork['data']['bjcrqrCount']??0);
int yhdzgCount = int.parse(keyTasksWork['data']['yhdzgCount']??0); int yhdzgCount = int.parse(keyTasksWork['data']['yhdzgCount']??0);
keyTasksNum = bjcrqrCount+yhdzgCount+zdzysqCount; keyTasksNum = bjcrqrCount+yhdzgCount+zdzysqCount;
} }
if (hiddenDangerWork['success']) { if (FormUtils.hasValue(hiddenDangerWork, 'success') && hiddenDangerWork['success']) {
List<dynamic> data = hiddenDangerWork['data']?? [] ; List<dynamic> data = hiddenDangerWork['data']?? [] ;
hiddenDangerNum = data.length; hiddenDangerNum = data.length;
} }