Commit 4bd451bcbdd7dd70e94e546421d83b910a6d9d76

Authored by 杨鸣坤
2 parents 71a27c8d def6772c

Merge branch 'test_hhl_0102' into test_sql

@@ -53,12 +53,12 @@ public class TkRepairOrderController extends BaseController { @@ -53,12 +53,12 @@ public class TkRepairOrderController extends BaseController {
53 } 53 }
54 } 54 }
55 55
56 - if (StringUtils.isBlank(dto.getId())) {  
57 - TkRepairOrderDTO roInfo = tkRepairOrderService.loadByDeviceId(dto.getDeviceId());  
58 - if (roInfo != null && roInfo.getStatus().name().equals(RepairOrderStatusEnum.SCHEDULING.name())) {  
59 - throw new TkDataValidationException("该设备已报修!");  
60 - }  
61 - } 56 +// if (StringUtils.isBlank(dto.getId())) {
  57 +// TkRepairOrderDTO roInfo = tkRepairOrderService.loadByDeviceId(dto.getDeviceId());
  58 +// if (roInfo != null && roInfo.getStatus().name().equals(RepairOrderStatusEnum.SCHEDULING.name())) {
  59 +// throw new TkDataValidationException("该设备已报修!");
  60 +// }
  61 +// }
62 62
63 if (dto.getStatus() == null) { 63 if (dto.getStatus() == null) {
64 dto.setStatus(RepairOrderStatusEnum.SCHEDULING); 64 dto.setStatus(RepairOrderStatusEnum.SCHEDULING);