fix(维修模块): 维修修改任务bug

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

@@ -1001,7 +1001,7 @@ public class RepairController {
             //发起任务
 //            TaskBto taskBto = new TaskBto(StatusEnum.REPAIR_BACK_DRAFT.id, "["+repairBackBillSaveVo.getReceiveUnit().substring(0,3) + "]型号" + repairBackBillSaveVo.getScriptSaveVos().get(0).getModel() + "共有" + repairBackBillSaveVo.getSendingCount() + "件至", null, ".", repairBackBill1.getId(), BusinessEnum.REPAIR_BACK.id, userUtils.getCurrentUnitId(), 0, null, userIds);
             TaskBto taskBto = new TaskBto(StatusEnum.REPAIR_BACK_DRAFT.id, "["+DeviceModelSort.unitNameToDisName(repairBackBillSaveVo.getReceiveUnit()) + "]型号" + repairBackBillSaveVo.getScriptSaveVos().get(0).getModel() + "共有" + repairBackBillSaveVo.getSendingCount() + "件至", null, ".", repairBackBill1.getId(), BusinessEnum.REPAIR_BACK.id, userUtils.getCurrentUnitId(), 0, null, userIds);
-            if (currentUnitLevel == 1 && units.getType() == 1){
+            if (currentUnitLevel == 1 && units.getType() == 1 && repairBackBillSaveVo.getReceiveUnitId() == 1){
                 taskBto.setCustomInfo("country");
             }
             TaskBto taskBto1 = taskService.start(taskBto);
@@ -1078,20 +1078,6 @@ public class RepairController {
         //草稿发起
         if (repairBackBillSaveVo.getTaskId() == null) {
 //            TaskBto taskBto1 = new TaskBto(StatusEnum.WAIT_BACK_RECEIVE.id, "["+repairBackBillSaveVo.getReceiveUnit().substring(0,3) + "]型号" + StringSplitUtil.stringListToString(repairBackBillSaveVo.getScriptSaveVos().stream().map(ScriptSaveVo::getModel).distinct().collect(Collectors.toList())) + "共有" + repairBackBillSaveVo.getSendingCount() + "件", null, ".", deviceRepairBackBillEntity1.getId(), BusinessEnum.REPAIR_BACK.id, userPublicService.findUnitIdByName(repairBackBill.getReceiveUnit()), 1, null, userIds);
-//            TaskBto taskBto1 = new TaskBto(StatusEnum.WAIT_BACK_RECEIVE.id,
-//                    "["+DeviceModelSort.unitNameToDisName(repairBackBillSaveVo.getReceiveUnit()) + "]型号" +
-//                            StringSplitUtil.stringListToString(repairBackBillSaveVo.getScriptSaveVos().stream()
-//                                    .map(ScriptSaveVo::getModel).distinct().
-//                                    collect(Collectors.toList())) + "共有" + repairBackBillSaveVo.getSendingCount() + "件",
-//                    null, ".", deviceRepairBackBillEntity1.getId(), BusinessEnum.REPAIR_BACK.id,
-//                    userPublicService.findUnitIdByName(repairBackBill.getReceiveUnit()), 1, null, userIds);
-//            TaskBto taskBto1 = new TaskBto(StatusEnum.WAIT_BACK_RECEIVE.id,
-//                    "["+DeviceModelSort.unitNameToDisName(repairBackBillSaveVo.getReceiveUnit()) + "]型号" +
-//                            StringSplitUtil.stringListToString(repairBackBillSaveVo.getScriptSaveVos().stream()
-//                                    .map(ScriptSaveVo::getModel).distinct().
-//                                    collect(Collectors.toList())) + "共有" + repairBackBillSaveVo.getSendingCount() + "件",
-//                    null, ".", deviceRepairBackBillEntity1.getId(), BusinessEnum.REPAIR_BACK.id,
-//                    userPublicService.findUnitIdByName(repairBackBill.getReceiveUnit()), 1, null, userIds);
             TaskBto taskBto1 = new TaskBto(StatusEnum.WAIT_BACK_RECEIVE.id,
                     "["+DeviceModelSort.unitNameToDisName(repairBackBillSaveVo.getReceiveUnit()) + "]型号" +
                             StringSplitUtil.stringListToString(repairBackBillSaveVo.getScriptSaveVos().stream()