From c1492b5f29a0480a75cf156b09cdde34afb8ebe5 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期五, 21 十月 2022 17:10:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
flower_city/src/main/java/com/dg/core/controller/OrganizationController.java | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/controller/OrganizationController.java b/flower_city/src/main/java/com/dg/core/controller/OrganizationController.java
index de7cf8c..4699d53 100644
--- a/flower_city/src/main/java/com/dg/core/controller/OrganizationController.java
+++ b/flower_city/src/main/java/com/dg/core/controller/OrganizationController.java
@@ -80,7 +80,7 @@
public ResultData updateConfig(@RequestBody OrganizationChartEntity entity,@CurrentUser SysUser sysUser)
{
entity.setUpdateTime(LocalDateTime.now());
- entity.setUpdateUserId(Integer.parseInt(String.valueOf(sysUser.getUserId())));
+ entity.setUpdateUserId(sysUser.getUserId());
return toAjax(iOrganizationChartService.updateConfig(entity));
}
@@ -187,5 +187,4 @@
}
return ids;
}
-
}
--
Gitblit v1.7.1