1

src/main/java/com/fdkankan/sale/service/impl/RepairServiceImpl.java

@@ -147,9 +147,11 @@ public class RepairServiceImpl extends ServiceImpl<IRepairMapper, Repair> implem
                 param.setRepairIds(repairIds);
             }
         }
-        param.getStatusList().add(param.getStatus());
-        if(param.getStatus().equals(RepairStatusEnum.TO_BE_RECOVERED.status())){
-            param.getStatusList().add(RepairStatusEnum.TO_BE_CANCELED_RECOVERED.status());
+        if(param.getStatus() != null){
+            param.getStatusList().add(param.getStatus());
+            if(param.getStatus().equals(RepairStatusEnum.TO_BE_RECOVERED.status())){
+                param.getStatusList().add(RepairStatusEnum.TO_BE_CANCELED_RECOVERED.status());
+            }
         }
         Page<RepairerVo> page = getBaseMapper().pageInfoList(new Page<>(param.getPageNum(), param.getPageSize()), param);
         sysUserService.setSaleNameAndRepairManName(page.getRecords());