Merge branch 'develop' of gitadmin/tuoheng_telecomumale into release

tuoheng-service/tuoheng-miniprogram/src/main/java/com/tuoheng/miniprogram/service/impl/WorkOrderServiceImpl.java

@@ -181,7 +181,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
                     .eq(WorkOrder::getMark, MarkEnum.VALID.getCode())
                     .orderByDesc(WorkOrder::getCreateTime));
             if (null == workPageData.getRecords()) {
-                return null;
+                return JsonResult.success("数据为空");
             }
 
             List<WorkOrderInfoVo>  getWorkOrderVo = this.getWorkOrderList(workPageData,user);
@@ -218,7 +218,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
                     .eq(WorkOrder::getMark, MarkEnum.VALID.getCode())
                     .orderByDesc(WorkOrder::getCreateTime));
             if (null == workPageData.getRecords()) {
-                return null;
+                return JsonResult.success("数据为空");
             }
 
             List<WorkOrderInfoVo>  getWorkOrderVo = this.getWorkOrderList(workPageData,user);
@@ -247,7 +247,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
                     .eq(WorkOrder::getMark, MarkEnum.VALID.getCode())
                     .orderByDesc(WorkOrder::getCreateTime));
             if (null == workPageData.getRecords()) {
-                return null;
+                return JsonResult.success("数据为空");
             }
 
             List<WorkOrderInfoVo>  getWorkOrderVo = this.getWorkOrderList(workPageData,user);