From 30ff6fd5d54f723f36a8e350d3cd24017951090e Mon Sep 17 00:00:00 2001 From: 张天森 <1292933220@qq.com> Date: 星期日, 09 十月 2022 15:50:39 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test --- flower_city/src/main/java/com/dg/core/api/GuideRepairOrderAppletsController.java | 8 +++++--- 1 files changed, 5 insertions(+), 3 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 e724a24..9d6036b 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 @@ -254,9 +254,11 @@ guideEvolveEntity.setState("3"); guideEvolveEntity.setFromDepartmentalId(sysUser.getDepartmentId()); guideEvolveEntity.setFromUserId(sysUser.getUserId()+""); - iGuideEvolveService.insertConfig(guideEvolveEntity); - - return toAjax(iGuideRepairOrderService.updateConfig(entity)); + int i = iGuideRepairOrderService.updateConfig(entity); + if (i>0) + return toAjax( iGuideEvolveService.insertConfig(guideEvolveEntity)); + else + return ResultData.error(); } /** -- Gitblit v1.7.1