From 36ad4a7119b7f17b574cdbb6cf470a43e53831b0 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 20 十月 2022 14:28:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
flower_city/src/main/java/com/dg/core/api/GuideRepairOrderAppletsController.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/api/GuideRepairOrderAppletsController.java b/flower_city/src/main/java/com/dg/core/api/GuideRepairOrderAppletsController.java
index 0b6e42b..2d70d6e 100644
--- a/flower_city/src/main/java/com/dg/core/api/GuideRepairOrderAppletsController.java
+++ b/flower_city/src/main/java/com/dg/core/api/GuideRepairOrderAppletsController.java
@@ -193,8 +193,8 @@
//新增已办结记录
entity.setCreateTime(LocalDateTime.now());
entity.setUpdateTime(LocalDateTime.now());
- entity.setDepartmentalId(order.getGuideDepartmentId());
- entity.setToUserId(order.getGuideUserId());
+ entity.setFromDepartmentalId(sysUser.getDepartmentId());
+ entity.setFromUserId(sysUser.getUserId()+"");
entity.setGuideId(order.getId().toString());
iGuideEvolveService.insertConfig(entity);
iGuideRepairOrderService.updateSysUserOrderNum(entity);
--
Gitblit v1.7.1