From de1e3af81b7dbde6f077f2abeacda7059fee21bb Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期三, 19 十月 2022 13:33:24 +0800
Subject: [PATCH] 修改【办事指南】：缺少复制 bug
---
flower_city/src/main/java/com/dg/core/controller/UserController.java | 30 +++++++++++++++++++++++-------
1 files changed, 23 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 7815ece..76755b1 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,11 +4,13 @@
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;
import com.dg.core.service.IHuaChengSysUserService;
import com.dg.core.util.SmsUtil;
+import com.dg.core.util.Snowflake;
import com.dg.core.util.TableDataInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -100,6 +102,7 @@
map.put("token", token);
map.put("userId", user.getUserId());
map.put("userName", user.getUserName());
+ map.put("permission", user.getPermission());
return ResultData.success(map);
}
@@ -125,6 +128,7 @@
map.put("token", token);
map.put("userId", user.getUserId());
map.put("userName", user.getUserName());
+ map.put("permission", user.getPermission());
return ResultData.success(map);
}
@@ -171,9 +175,9 @@
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,"1");
+ List<SysUser> list = IUserService.selectConfigList(pageParam,pageSize,"3");
- int num=IUserService.selectNum("1");
+ int num=IUserService.selectNum("3");
return getDataTable(list,num);
}
@@ -187,7 +191,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");
@@ -206,12 +210,20 @@
return error("昵称不能为空");
}
- SysUser user = IUserService.getUserByAccount(config.getLoginName());
+ if(StringUtils.isEmpty(config.getPhonenumber()))
+ {
+ return error("手机号不能为空");
+ }
+
+ SysUser user = IUserService.selectData("",config.getPhonenumber());
if (user != null) {
//提示用户名或密码错误
return error("该账户已存在！");
}
+
+ config.setCreateBy(sysUser.getUserId()+"");
+ config.setUserId(Snowflake.getId());
config.setUserType("3");
config.setCreateTime(LocalDateTime.now());
@@ -229,11 +241,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()))
@@ -242,6 +254,8 @@
}
config.setUserType("3");
+
+ config.setUpdateBy(sys.getUserId()+"");
return toAjax(IUserService.updateConfig(config));
}
@@ -319,6 +333,8 @@
return error("输入密码与原密码不能相同！");
}
+
+
return toAjax(IUserService.updateConfig(config));
}
--
Gitblit v1.7.1