2026.6.25 口门门禁bug

lib/customWidget/department_picker_enterprise.dart

@@ -109,8 +109,18 @@ class _DepartmentPickerEnterpriseState extends State<DepartmentPickerEnterprise>
 
       final result = await DoorAndCarApi.getJurisdictionalAuthorityListTree(widget.jurisdictionalAuthorityId);
       raw = result['data'];
+      // 根据 jurisdictionalCorpId 去重
+      List<dynamic> uniqueData = raw.fold([], (List<dynamic> acc, item) {
+        String corpId = item['jurisdictionalCorpId']?.toString() ?? '';
+        bool exists = acc.any((element) => element['jurisdictionalCorpId']?.toString() == corpId);
+        if (!exists && corpId.isNotEmpty) {
+          acc.add(item);
+        }
+        return acc;
+      });
 
       setState(() {
+        raw =uniqueData;
         original = raw.map((e) => CategoryEnterpriseType.fromJson(e as Map<String, dynamic>)).toList();
         filtered = original;
         loading = false;

lib/pages/home/doorAndCar/car/firstlevel_car_add_page.dart

@@ -772,8 +772,8 @@ class _FirstlevelCarAddPageState extends State<FirstlevelCarAddPage> {
         return;
       }
 
-      addData['drivingUserId']=_personList[0].userPhone;
-      addData['drivingUserName']=_personList[0].userCard;
+      addData['drivingUserId']=_personList[0].employeePersonUserId;
+      addData['drivingUserName']=_personList[0].employeePersonUserName;
       addData['lsUserPhone']=_personList[0].userPhone;
       addData['lsUserIdcard']=_personList[0].userCard;
 

lib/pages/home/doorAndCar/car/onlyLook_car_application.dart

@@ -197,7 +197,7 @@ class _OnlylookCarApplicationState extends State<OnlylookCarApplication> {
             label: '驾驶人姓名:',
             isEditable: false,
             horizontalnum: 0,
-            text: info['employeeVehicleUserName'] ?? '',
+            text: info['drivingUserName'] ?? '',
             onTap: () {},
           ),
           const Divider(),

lib/pages/home/doorAndCar/person/doorArea_person_record_page.dart

@@ -400,7 +400,7 @@ class _DoorareaPersonRecordPageState extends State<DoorareaPersonRecordPage> {
                 Expanded(
                   child: SearchBarWidget(
                     showResetButton: true,
-                    hintText: '请输入关键字',
+                    hintText: '请输入项目名称',
                     resetButtonText: '重置',
                     onReset: () {
                       FocusScope.of(context).unfocus();
@@ -453,7 +453,7 @@ class _DoorareaPersonRecordPageState extends State<DoorareaPersonRecordPage> {
     // int type = item['auditFlag']??"";
 
     int type =0;
-    if(widget.type==1||widget.type==2||widget.type==3||widget.type==4){
+    if(widget.type==1||widget.type==2||widget.type==3||widget.type==4||widget.type==7){
        type = int.tryParse(item['auditFlag']?.toString() ?? '') ?? 0;
     }else{
        type = int.tryParse(item['auditStatus']?.toString() ?? '') ?? 0;
@@ -467,7 +467,7 @@ class _DoorareaPersonRecordPageState extends State<DoorareaPersonRecordPage> {
     } else if (4 == type) {
       return "无需审批（长期人员）";
     } else {
-      return "无需审批";
+      return "";
     }
   }
 

lib/pages/home/doorAndCar/person/onlyLook_doorarea_person.dart

@@ -261,7 +261,7 @@ class _OnlylookDoorareaPersonState extends State<OnlylookDoorareaPerson> {
       }
 
 
-      Widget _buildPersonCard(Map<String, String> person) {
+      Widget _buildPersonCard(Map<String, dynamic> person) {
         return Card(
           margin: EdgeInsets.only(bottom: 12),
           color: Colors.white,
@@ -279,7 +279,7 @@ class _OnlylookDoorareaPersonState extends State<OnlylookDoorareaPerson> {
                   children: [
                     Expanded(
                       child:   Text(
-                        '姓名: ${person['employeePersonUserName']}',
+                        '姓名: ${person['employeePersonUserName']??''}',
                         style: TextStyle(
                           fontSize: 14,
                           color: Colors.grey[700],
@@ -290,7 +290,7 @@ class _OnlylookDoorareaPersonState extends State<OnlylookDoorareaPerson> {
                     SizedBox(width: 24),
                     Expanded(
                       child:  Text(
-                        '部门: ${person['personDepartmentName']}',
+                        '部门: ${person['personCorpName']??''}',
                         style: TextStyle(
                           fontSize: 14,
                           color: Colors.grey[700],
@@ -362,7 +362,13 @@ class _OnlylookDoorareaPersonState extends State<OnlylookDoorareaPerson> {
 
             setState(() async {
               applicationInfo=result['data'];
-              personnelList=applicationInfo['personApplyList']??[];
+              // personnelList=applicationInfo['personApplyList']??[];
+              dynamic entourageData = jsonDecode(applicationInfo['entourage'] ?? '[]');
+              if (entourageData is List) {
+                personnelList = entourageData.cast<Map<String, dynamic>>();
+              } else {
+                personnelList = [];
+              }
 
               final imageResults = await Future.wait([
                 FileApi.getImagePath(applicationInfo['informSignId'], UploadFileType.enclosedAreaPersonnelApplicantSignature),