From 2636fff845e9460ca35abb20e7a22d34fb4f39a3 Mon Sep 17 00:00:00 2001 From: rain <1679827795@qq.com> Date: Thu, 22 Jan 2026 11:23:25 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdWorkOrderServiceImpl.java | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdWorkOrderServiceImpl.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdWorkOrderServiceImpl.java index 5765a4b..253c812 100644 --- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdWorkOrderServiceImpl.java +++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdWorkOrderServiceImpl.java @@ -171,11 +171,11 @@ case 1: // 接单 case 7: // 同意修改 newStatusEnum = WorkOrderStatusEnum.RESPONDING_TO_BE_SPLIT; - workOrder.setServiceParty(AuthUtil.getUserName()); + workOrder.setServiceParty(AuthUtil.getNickName()); break; case 2: // 拒接接单 newStatusEnum = WorkOrderStatusEnum.PUBLISHING_REJECTING; - workOrder.setServiceParty(AuthUtil.getUserName()); + workOrder.setServiceParty(AuthUtil.getNickName()); break; case 3: // 申请取消 newStatusEnum = WorkOrderStatusEnum.RESPONDING_APPLY_CANCEL; @@ -185,18 +185,18 @@ break; case 5: // 同意取消 newStatusEnum = WorkOrderStatusEnum.RESPONDING_CANCELED; - workOrder.setServiceParty(AuthUtil.getUserName()); + workOrder.setServiceParty(AuthUtil.getNickName()); break; case 6: // 不同意取消 newStatusEnum = WorkOrderStatusEnum.RESPONDING_REJECT_CANCEL; break; case 8: // 不同意修改 newStatusEnum = WorkOrderStatusEnum.RESPONDING_REJECT_MODIFY; - workOrder.setServiceParty(AuthUtil.getUserName()); + workOrder.setServiceParty(AuthUtil.getNickName()); break; case 9: // 协商修改 --> 协商修改 newStatusEnum = WorkOrderStatusEnum.EXECUTING_NEGOTIATE_MODIFY; - workOrder.setServiceParty(AuthUtil.getUserName()); + workOrder.setServiceParty(AuthUtil.getNickName()); break; case 10: // 同意协商修改 --> 待拆分 newStatusEnum = WorkOrderStatusEnum.RESPONDING_TO_BE_SPLIT; -- Gitblit v1.9.3