From 0f28c38f1a978a47b8221dff56eeebf26a9e6fac Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期四, 20 十月 2022 14:39:36 +0800
Subject: [PATCH] 修改bug
---
flower_city/src/main/java/com/dg/core/controller/UserController.java | 22 +++++++++++++++-------
1 files changed, 15 insertions(+), 7 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 29d6511..d9d759b 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
@@ -4,6 +4,7 @@
import com.dg.core.HttpStatus;
import com.dg.core.ResultData;
import com.dg.core.annotation.Authorization;
+import com.dg.core.annotation.CurrentUser;
import com.dg.core.db.gen.entity.HuaChengSysUser;
import com.dg.core.db.gen.entity.SysUser;
import com.dg.core.manager.TokenManager;
@@ -169,14 +170,15 @@
@GetMapping("/getlist")
@Authorization
public TableDataInfo selectConfigList(@RequestParam(value = "pageNum",required = false) Integer pageNum,
- @RequestParam(value = "pageSize",required = false) Integer pageSize)
+ @RequestParam(value = "pageSize",required = false) Integer pageSize,
+ @RequestParam(value = "keyword",required = false) String keyword)
{
Assert.notNull(pageNum, "pageNum can not be empty");
Assert.notNull(pageSize, "pageSize can not be empty");
Page<SysUser> pageParam = new Page<>(pageNum,pageSize);
- List<SysUser> list = IUserService.selectConfigList(pageParam,pageSize,"3");
+ List<SysUser> list = IUserService.selectConfigList(pageParam,pageSize,"3",keyword);
- int num=IUserService.selectNum("3");
+ int num=IUserService.selectNum("3",keyword);
return getDataTable(list,num);
}
@@ -190,7 +192,7 @@
@ApiOperation("新增用户接口")
@PostMapping("/add")
@Authorization
- public ResultData insertConfig(@RequestBody SysUser config)
+ public ResultData insertConfig(@RequestBody SysUser config, @CurrentUser SysUser sysUser)
{
Assert.notNull(config, "parameter can not be empty");
@@ -220,6 +222,8 @@
return error("该账户已存在！");
}
+
+ config.setCreateBy(sysUser.getUserId()+"");
config.setUserId(Snowflake.getId());
config.setUserType("3");
@@ -238,11 +242,11 @@
@ApiOperation("修改用户接口")
@PostMapping("/update")
@Authorization
- public ResultData updateConfig(@RequestBody SysUser config)
+ public ResultData updateConfig(@RequestBody SysUser config,@CurrentUser SysUser sys)
{
- if(config.getUserId()==null)
+ if(config.getId()==null)
{
- return error("userId不能为空");
+ return error("Id不能为空");
}
if(StringUtils.isEmpty(config.getLoginName()))
@@ -251,6 +255,8 @@
}
config.setUserType("3");
+
+ config.setUpdateBy(sys.getUserId()+"");
return toAjax(IUserService.updateConfig(config));
}
@@ -328,6 +334,8 @@
return error("输入密码与原密码不能相同！");
}
+
+
return toAjax(IUserService.updateConfig(config));
}
--
Gitblit v1.7.1