From 47b8d29b211c1a3644955ef768d01d2985a25dfc Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期二, 18 十月 2022 16:43:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
flower_city/src/main/java/com/dg/core/controller/UserController.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/controller/UserController.java b/flower_city/src/main/java/com/dg/core/controller/UserController.java
index 283cbd9..d83f522 100644
--- a/flower_city/src/main/java/com/dg/core/controller/UserController.java
+++ b/flower_city/src/main/java/com/dg/core/controller/UserController.java
@@ -241,7 +241,7 @@
@ApiOperation("修改用户接口")
@PostMapping("/update")
@Authorization
- public ResultData updateConfig(@RequestBody SysUser config)
+ public ResultData updateConfig(@RequestBody SysUser config,@CurrentUser SysUser sys)
{
if(config.getUserId()==null)
{
@@ -254,6 +254,8 @@
}
config.setUserType("3");
+
+ config.setUpdateBy(sys.getUserId()+"");
return toAjax(IUserService.updateConfig(config));
}
@@ -331,6 +333,8 @@
return error("输入密码与原密码不能相同！");
}
+
+
return toAjax(IUserService.updateConfig(config));
}
--
Gitblit v1.7.1