From 8876b1b9cd27fad076ea9e5f3e04197b84ba02bd Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 01 八月 2024 14:26:56 +0800
Subject: [PATCH] 代码提交 bug解决
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java | 63 ++++++++++++++++++++++++-------
1 files changed, 48 insertions(+), 15 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
index 02219e6..7913af9 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
@@ -100,7 +100,7 @@
public AjaxResult list(@Validated @RequestBody SysUserQuery query) {
PageInfo<SysUser> pageInfo = new PageInfo<>(query.getPageCurr(), query.getPageSize());
PageInfo<SysUser> page = userService.getList(pageInfo, query.getNickName(),
- query.getPhonenumber(), query.getStatus());
+ query.getPhonenumber(), query.getStatus(),query.getDeptId());
return AjaxResult.success(page);
}
@@ -114,7 +114,7 @@
public AjaxResult add(@Validated(InsertGroup.class) @RequestBody SysUserDTO dto) {
SysUser user = BeanUtils.copyBean(dto, SysUser.class);
user.setUserId(null);
- user.setUserType(dto.getIsAuctioneer() == 1 ? "03" : "00");
+ user.setUserType("01");
user.setUserName(user.getPhonenumber());
if(!org.springframework.util.StringUtils.hasLength(user.getNickName())){
user.setNickName(user.getPhonenumber());
@@ -125,7 +125,14 @@
user.setCreateBy(SecurityUtils.getUsername());
user.setPassword(SecurityUtils.encryptPassword("a123456"));
user.setRoleType(1);
- int i = userService.insertUser(user);
+ user.setDept(deptService.selectDeptById(dto.getDeptId()));
+ SysDept sysDept= deptService.selectDeptById(dto.getDeptId());
+ user.setDeptName(sysDept.getDeptName());
+ user.setDeptId(dto.getDeptId());
+ SysRole byId = roleService.selectRoleById(dto.getRoleId());
+ user.setRoleName(byId.getRoleName());
+ user.setRoleId(dto.getRoleId());
+ userService.save(user);
SysUserRole sysUserRole = new SysUserRole();
sysUserRole.setRoleId(dto.getRoleId());
sysUserRole.setUserId(user.getUserId());
@@ -145,14 +152,15 @@
AjaxResult ajax = AjaxResult.success();
List<SysRole> roles = roleService.selectRoleAll();
ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
- ajax.put("posts", postService.selectPostAll());
+ ajax.put("Dept", deptService.selectDeptList(null));
if (StringUtils.isNotNull(userId)) {
- SysUser sysUser = userService.selectUserById(userId);
+ SysUser sysUser = userService.getById(userId);
ajax.put(AjaxResult.DATA_TAG, sysUser);
- ajax.put("postIds", postService.selectPostListByUserId(userId));
- ajax.put("roleIds", sysUser.getRoles().stream().map(SysRole::getRoleId).collect(Collectors.toList()));
+ ajax.put("Dept", sysUser.getDept());
+ ajax.put("roleId", sysUser.getRoleId());
+ ajax.put("roleName", sysUser.getRoleName());
}
- return AjaxResult.success(ajax);
+ return ajax;
}
@@ -196,7 +204,14 @@
user.setPassword(null);
user.setUpdateBy(SecurityUtils.getUsername());
user.setUpdateTime(new Date());
- return toAjax(userService.updateUser(user));
+ user.setDept(deptService.selectDeptById(dto.getDeptId()));
+ SysDept sysDept= deptService.selectDeptById(dto.getDeptId());
+ user.setDeptName(sysDept.getDeptName());
+ user.setDeptId(dto.getDeptId());
+ SysRole byId = roleService.selectRoleById(dto.getRoleId());
+ user.setRoleName(byId.getRoleName());
+ user.setRoleId(dto.getRoleId());
+ return toAjax(userService.updateById(user));
}
@@ -260,7 +275,13 @@
@PostMapping("/getUserSupplierList")
public R<List<SysUser>> getUserSupplierList(@RequestBody getVolumeProductionRkQuery getVolumeProductionRkQuery) {
- List<SysUser> list = userService.list(new LambdaQueryWrapper<SysUser>().like(SysUser::getNickName, getVolumeProductionRkQuery.getSupplierName()).like(SysUser::getPhonenumber,getVolumeProductionRkQuery.getSupplierPhone()));
+ LambdaQueryWrapper<SysUser> like1 = new LambdaQueryWrapper<SysUser>();
+ if (getVolumeProductionRkQuery.getSupplierName()!=null){
+ like1.like(SysUser::getNickName, getVolumeProductionRkQuery.getSupplierName());
+ }if (getVolumeProductionRkQuery.getSupplierPhone()!=null){
+ like1.like(SysUser::getPhonenumber,getVolumeProductionRkQuery.getSupplierPhone());
+ }
+ List<SysUser> list = userService.list(like1);
return R.ok(list);
}
@@ -379,7 +400,7 @@
@PostMapping("/resetPwd")
public AjaxResult resetPwd(@RequestBody ResetPwdDTO dto) {
SysUser user = userService.lambdaQuery().eq(SysUser::getUserId, dto.getUserId())
- .in(SysUser::getUserType, "00", "02").one();
+ .in(SysUser::getUserType, "00", "01", "02", "03").one();
if (StringUtils.isNull(user)) {
throw new ServiceException("账号不存在");
}
@@ -551,6 +572,13 @@
return R.ok(userService.getSupplierPage(query));
}
+
+ @ApiOperation(value = "获取供应商不分页列表", notes = "获取供应商不分页列表")
+ @PostMapping("/supplier-page1")
+ public R<List<SysUser>> getSupplierPage1() {
+ return R.ok(userService.getSupplierPage1());
+ }
+
/**
* 添加/编辑供应商
*
@@ -577,10 +605,16 @@
}
- @ApiOperation(value = "获取管理员分页列表", notes = "获取管理员分页列表")
+ @ApiOperation(value = "获取仓库管理员分页列表", notes = "获取仓库管理分页列表")
@PostMapping("/conservator-page")
public R<PageDTO<ConservatorVO>> getConservatorPage(@Validated @RequestBody ConservatorQuery query) {
return R.ok(userService.getConservatorPage(query));
+ }
+
+ @ApiOperation(value = "获取仓库管理员不分页列表", notes = "获取仓库管理分页列表")
+ @PostMapping("/conservator-page1")
+ public R<List<SysUser>> getConservatorPage1() {
+ return R.ok(userService.getConservatorPage1());
}
/**
@@ -588,8 +622,7 @@
*
* @param dto 供应商数据传输对象
*/
- @Log(title = "供应商管理", businessType = BusinessType.UPDATE)
- @ApiOperation(value = "添加/编辑管理员", notes = "添加/编辑管理员")
+ @ApiOperation(value = "添加/编辑仓库管理", notes = "添加/编辑仓库管理")
@PostMapping("/save-conservator")
public R<?> saveConservator(@Validated @RequestBody ConservatorDTO dto) {
userService.saveConservator(dto);
@@ -601,7 +634,7 @@
*
* @param id 供应商id
*/
- @ApiOperation(value = "删除供应商", notes = "删除供应商")
+ @ApiOperation(value = "删除仓库管理", notes = "删除仓库管理")
@DeleteMapping("/delete-conservator/{id}")
public R<?> deleteConservator(@PathVariable("id") Long id) {
userService.deleteConservator(id);
--
Gitblit v1.7.1