From 01b70437d4ef3348e69b2af0dcbd7250e1234117 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期五, 25 十一月 2022 13:54:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
flower_city/src/main/java/com/dg/core/controller/RoleManagementController.java | 5 ++---
1 files changed, 2 insertions(+), 3 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 8c134dd..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
@@ -42,7 +42,6 @@
{
return getDataTable("分页不能为空");
}
-
if(pageSize==null)
{
return getDataTable("分页条数不能为空");
@@ -77,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