Browse Source

Merge branch 'develop' of gitadmin/tuoheng_telecomumale into release

tags/v1.0.0^2
chengwang 1 year ago
parent
commit
bb4ba73cc2
1 changed files with 3 additions and 3 deletions
  1. +3
    -3
      tuoheng-service/tuoheng-miniprogram/src/main/java/com/tuoheng/miniprogram/service/impl/WorkOrderServiceImpl.java

+ 3
- 3
tuoheng-service/tuoheng-miniprogram/src/main/java/com/tuoheng/miniprogram/service/impl/WorkOrderServiceImpl.java View File

.eq(WorkOrder::getMark, MarkEnum.VALID.getCode()) .eq(WorkOrder::getMark, MarkEnum.VALID.getCode())
.orderByDesc(WorkOrder::getCreateTime)); .orderByDesc(WorkOrder::getCreateTime));
if (null == workPageData.getRecords()) { if (null == workPageData.getRecords()) {
return null;
return JsonResult.success("数据为空");
} }


List<WorkOrderInfoVo> getWorkOrderVo = this.getWorkOrderList(workPageData,user); List<WorkOrderInfoVo> getWorkOrderVo = this.getWorkOrderList(workPageData,user);
.eq(WorkOrder::getMark, MarkEnum.VALID.getCode()) .eq(WorkOrder::getMark, MarkEnum.VALID.getCode())
.orderByDesc(WorkOrder::getCreateTime)); .orderByDesc(WorkOrder::getCreateTime));
if (null == workPageData.getRecords()) { if (null == workPageData.getRecords()) {
return null;
return JsonResult.success("数据为空");
} }


List<WorkOrderInfoVo> getWorkOrderVo = this.getWorkOrderList(workPageData,user); List<WorkOrderInfoVo> getWorkOrderVo = this.getWorkOrderList(workPageData,user);
.eq(WorkOrder::getMark, MarkEnum.VALID.getCode()) .eq(WorkOrder::getMark, MarkEnum.VALID.getCode())
.orderByDesc(WorkOrder::getCreateTime)); .orderByDesc(WorkOrder::getCreateTime));
if (null == workPageData.getRecords()) { if (null == workPageData.getRecords()) {
return null;
return JsonResult.success("数据为空");
} }


List<WorkOrderInfoVo> getWorkOrderVo = this.getWorkOrderList(workPageData,user); List<WorkOrderInfoVo> getWorkOrderVo = this.getWorkOrderList(workPageData,user);

Loading…
Cancel
Save