From 5e7892cd0921111dfbaf84196f2593f8045d1c11 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 08 十二月 2022 13:16:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panzhihua
---
flower_city/src/main/java/com/dg/core/controller/RoleManagementController.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 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..bcc1744 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;
@@ -40,7 +42,6 @@
{
return getDataTable("分页不能为空");
}
-
if(pageSize==null)
{
return getDataTable("分页条数不能为空");
@@ -61,9 +62,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 +76,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