[fix] 修复查询项目列表空指针

src/main/java/vion/service/impl/StoreServiceImpl.java

@@ -212,13 +212,14 @@ public class StoreServiceImpl extends MPJBaseServiceImpl<StoreMapper, Store> imp
                     .map(v -> converter.convert(v, ContractVO.class))
                     .map(v -> converter.convert(v, ContractVO.class))
                     .toList());
                     .toList());
 
 
-            var masterContract = id2ContractMap.getOrDefault(item.getMasterContract(), null);
+            var masterContract = id2ContractMap.get(item.getMasterContract());
             // 关联合同验收时间
             // 关联合同验收时间
             Opt.ofNullable(masterContract)
             Opt.ofNullable(masterContract)
                     .map(c -> contractId2CpMap.getOrDefault(c.getId(), List.of()))
                     .map(c -> contractId2CpMap.getOrDefault(c.getId(), List.of()))
                     .filter(CollUtil::isNotEmpty)
                     .filter(CollUtil::isNotEmpty)
                     .map(l -> l.getFirst().getNodeDate())
                     .map(l -> l.getFirst().getNodeDate())
-                    .ifPresent(masterContract::setFinalDate);
+                    // masterContract 可能为 null，不能使用这种写法 masterContract::setFinalDate
+                    .ifPresent(nodeDate -> masterContract.setFinalDate(nodeDate));
             storeVO.setMainContract(Opt.ofNullable(masterContract).map(c -> converter.convert(c, ContractVO.class)).orElse(null));
             storeVO.setMainContract(Opt.ofNullable(masterContract).map(c -> converter.convert(c, ContractVO.class)).orElse(null));
 
 
             storeVO.setTaskCount(store2TaskIdMap.getOrDefault(storeId, List.of()).size());
             storeVO.setTaskCount(store2TaskIdMap.getOrDefault(storeId, List.of()).size());
@@ -233,7 +234,7 @@ public class StoreServiceImpl extends MPJBaseServiceImpl<StoreMapper, Store> imp
             // 关联标签
             // 关联标签
             storeVO.setTagList(storeId2TagMap.getOrDefault(storeId, List.of()));
             storeVO.setTagList(storeId2TagMap.getOrDefault(storeId, List.of()));
             // 关联项目负责人 or 项目经理
             // 关联项目负责人 or 项目经理
-            storeVO.setMainUser(storeId2UserIdMap.getOrDefault(storeId, null));
+            storeVO.setMainUser(storeId2UserIdMap.get(storeId));
             storeVOList.add(storeVO);
             storeVOList.add(storeVO);
         });
         });
         return Page.<StoreVO>of(data.getPageNum(), data.getPageSize(), storeList.getTotal()).setRecords(storeVOList);
         return Page.<StoreVO>of(data.getPageNum(), data.getPageSize(), storeList.getTotal()).setRecords(storeVOList);
@@ -355,7 +356,9 @@ public class StoreServiceImpl extends MPJBaseServiceImpl<StoreMapper, Store> imp
         MPJLambdaWrapper<Store> wrapper = new MPJLambdaWrapper<Store>()
         MPJLambdaWrapper<Store> wrapper = new MPJLambdaWrapper<Store>()
                 .select(Store::getId, Store::getName, Store::getTaskDetail, Store::getPlanFinishDate, Store::getPercentage, Store::getStuckPoint, Store::getIsImportant)
                 .select(Store::getId, Store::getName, Store::getTaskDetail, Store::getPlanFinishDate, Store::getPercentage, Store::getStuckPoint, Store::getIsImportant)
                 .selectCollection(User.class, StoreVO::getUserNameList, map -> map.result(User::getUsername))
                 .selectCollection(User.class, StoreVO::getUserNameList, map -> map.result(User::getUsername))
-                .leftJoin(RStoreUser.class, on -> on.eq(RStoreUser::getStoreId, Store::getId).eq(RStoreUser::getIsMain, 1))
+                .leftJoin(RStoreUser.class, on -> on
+                        .eq(RStoreUser::getStoreId, Store::getId)
+                        .eq(RStoreUser::getIsMain, 1))
                 .leftJoin(User.class, User::getId, RStoreUser::getUserId)
                 .leftJoin(User.class, User::getId, RStoreUser::getUserId)
                 .eq(Store::getIsImportant, 1)
                 .eq(Store::getIsImportant, 1)
                 .orderByAsc(Store::getFinishDate);
                 .orderByAsc(Store::getFinishDate);