From 0e6da184ed0a6d511a17e1ed86a470cda71c0f3b Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 22 九月 2025 16:51:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
index 021241b..5fa85d2 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
@@ -25,7 +25,9 @@
import com.ruoyi.system.service.*;
import com.ruoyi.system.vo.system.SysUserVO;
import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
import org.apache.poi.ss.usermodel.Workbook;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -77,6 +79,18 @@
return AjaxResult.success(list);
}
+ /**
+ * 获取用户列表
+ */
+ @ApiOperation(value = "根据部门id获取用户列表")
+ @GetMapping("/listByDeptId")
+ public AjaxResult<PageInfo<SysUserVO>> listByDeptId(@ApiParam(value = "部门id")Integer deptId,
+ @ApiParam(value = "分页参数，当前页码")
+ Integer pageNum,
+ @ApiParam(value = "分页参数，每页数量，默认为10") Integer pageSize ) {
+ PageInfo<SysUserVO> list = userService.listByDeptId(deptId,pageNum,pageSize);
+ return AjaxResult.success(list);
+ }
@ApiOperation(value = "获取用户列表-不分页")
@PostMapping("/listNotPage")
@@ -160,6 +174,7 @@
} else if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user)) {
return error("新增用户'" + user.getUserName() + "'失败，手机号码已存在");
}
+ user.setUserName(user.getPhonenumber());
user.setCreateBy(getUsername());
user.setPassword(SecurityUtils.encryptPassword("123456"));
userService.insertUser(user);
@@ -257,7 +272,7 @@
} else if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user)) {
return error("修改用户'" + user.getUserName() + "'失败，手机号码已存在");
}
-
+ user.setUserName(user.getPhonenumber());
user.setUpdateBy(getUsername());
if (StringUtils.isNotEmpty(user.getPassword())) {
user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
--
Gitblit v1.7.1