From 947d016e4bd349b78d540e3a869f55d68b2c610c Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期二, 08 十一月 2022 18:16:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
flower_city/src/main/java/com/dg/core/controller/RoleManagementController.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/controller/RoleManagementController.java b/flower_city/src/main/java/com/dg/core/controller/RoleManagementController.java
index 6c609d4..6b61c82 100644
--- a/flower_city/src/main/java/com/dg/core/controller/RoleManagementController.java
+++ b/flower_city/src/main/java/com/dg/core/controller/RoleManagementController.java
@@ -3,7 +3,9 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.dg.core.ResultData;
import com.dg.core.annotation.Authorization;
+import com.dg.core.annotation.CurrentUser;
import com.dg.core.db.gen.entity.RoleManagementEntity;
+import com.dg.core.db.gen.entity.SysUser;
import com.dg.core.service.IRoleManagementService;
import com.dg.core.util.TableDataInfo;
import io.swagger.annotations.Api;
@@ -61,9 +63,9 @@
@ApiOperation("新增角色")
@PostMapping("/add")
@Authorization
- public ResultData insertConfig(@RequestBody RoleManagementEntity entity)
+ public ResultData insertConfig(@RequestBody RoleManagementEntity entity, @CurrentUser SysUser sysUser)
{
-// entity.setCreateUserId(sysUser.getUserId()+"");
+ entity.setCreateUserId(sysUser.getUserId()+"");
return toAjax(iRoleManagementService.insertConfig(entity));
}
@@ -75,9 +77,9 @@
@ApiOperation("编辑角色")
@PostMapping("/update")
@Authorization
- public ResultData updateConfig(@RequestBody RoleManagementEntity entity)
+ public ResultData updateConfig(@RequestBody RoleManagementEntity entity,@CurrentUser SysUser sysUser)
{
-// entity.setUpdateUserId(sysUser.getUserId()+"");
+ entity.setUpdateUserId(sysUser.getUserId()+"");
return toAjax(iRoleManagementService.updateConfig(entity));
}
--
Gitblit v1.7.1