fix(维修模块): 修改了维修撤回的bug

dev-repair/src/main/java/com/tykj/dev/device/repair/controller/RepairController.java

@@ -2305,9 +2305,14 @@ public class RepairController {
                 }
             }).collect(Collectors.toList());
             repairDetails.forEach(repairDetail -> {
-                repairDetail.setDeviceRepairBillId(0);
+                if (repairDetail.getLocationUnit().equals(repairDetail.getOwnUnit())){
+                    repairDetail.setDeviceRepairBillId(0);
+                }
+
                 repairDetail.setRepairStatus(RepairStatusEnum.WAIT_SEND.id);
-                repairDetail.setLocationUnit(repairDetail.getOwnUnit());
+//                if (repairDetail.getLocationUnit())
+//
+//                    repairDetail.setLocationUnit(repairDetail.getOwnUnit());
                 repairDetailDao.save(repairDetail);
             });
             //直接删除维修单
@@ -2380,9 +2385,11 @@ public class RepairController {
             List<RepairDetail> repairDetails = byRepairBackBillId.stream().filter(repairDetail -> repairDetail.getDeviceRepairBillId() != null && !repairDetail.getLocationUnit().equals(repairDetail.getOwnUnit()) && repairDetail.getRepairStatus().equals(RepairStatusEnum.RECEIVE_WAIT_STORAGE.id) && repairDetail.getLocationUnit().equals(currentUserUnitName))
                     .collect(Collectors.toList());
             for (RepairDetail repairDetail : repairDetails) {
-                repairDetail.setRepairBackBillId(0);
+                if (!repairDetail.getLocationUnit().equals(repairDetail.getOwnUnit())){
+                    repairDetail.setRepairBackBillId(0);
+                }
                 repairDetail.setRepairStatus(2);
-                repairDetail.setLocationUnit(repairDetail.getOwnUnit());
+//                repairDetail.setLocationUnit(repairDetail.getOwnUnit());
                 repairDetailDao.save(repairDetail);
             }
             //删除账单