lbqms.git - Gitblit

			@@ -8,6 +8,7 @@
			import com.ruoyi.common.constant.UserConstants;
			import com.ruoyi.common.core.controller.BaseController;
			import com.ruoyi.common.core.domain.AjaxResult;
			import com.ruoyi.common.core.domain.PageQuery;
			import com.ruoyi.common.core.domain.entity.SysDept;
			import com.ruoyi.common.core.domain.entity.SysRole;
			import com.ruoyi.common.core.domain.entity.SysUser;
			@@ -25,7 +26,6 @@
			import com.ruoyi.system.service.ISysUserService;
			import io.swagger.annotations.*;
			import lombok.RequiredArgsConstructor;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.validation.annotation.Validated;
			import org.springframework.web.bind.annotation.*;
			import org.springframework.web.multipart.MultipartFile;
			@@ -44,7 +44,7 @@
			*/
			@Validated
			@Api(value = "用户信息控制器", tags = {"用户信息管理"})
			@RequiredArgsConstructor(onConstructor_ = @Autowired)
			@RequiredArgsConstructor
			@RestController
			@RequestMapping("/system/user")
			public class SysUserController extends BaseController {
			@@ -59,8 +59,8 @@
			@ApiOperation("获取用户列表")
			@SaCheckPermission("system:user:list")
			@GetMapping("/list")
			public TableDataInfo<SysUser> list(SysUser user) {
			return userService.selectPageUserList(user);
			public TableDataInfo<SysUser> list(SysUser user, PageQuery pageQuery) {
			return userService.selectPageUserList(user, pageQuery);
			}

			@ApiOperation("导出用户列表")
			@@ -83,7 +83,7 @@

			@ApiOperation("导入用户列表")
			@ApiImplicitParams({
			@ApiImplicitParam(name = "file", value = "导入文件", dataType = "java.io.File", required = true),
			@ApiImplicitParam(name = "file", value = "导入文件", dataType = "java.io.File", required = true),
			})
			@Log(title = "用户管理", businessType = BusinessType.IMPORT)
			@SaCheckPermission("system:user:import")
			@@ -104,17 +104,18 @@
			*/
			@ApiOperation("根据用户编号获取详细信息")
			@SaCheckPermission("system:user:query")
			@GetMapping(value = {"/", "/{userId}" })
			@GetMapping(value = {"/", "/{userId}"})
			public AjaxResult<Map<String, Object>> getInfo(@ApiParam("用户ID") @PathVariable(value = "userId", required = false) Long userId) {
			userService.checkUserDataScope(userId);
			userService.checkUserDataScope(userId);
			Map<String, Object> ajax = new HashMap<>();
			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());
			if (StringUtils.isNotNull(userId)) {
			ajax.put("user", userService.selectUserById(userId));
			if (ObjectUtil.isNotNull(userId)) {
			SysUser sysUser = userService.selectUserById(userId);
			ajax.put("user", sysUser);
			ajax.put("postIds", postService.selectPostListByUserId(userId));
			ajax.put("roleIds", roleService.selectRoleListByUserId(userId));
			ajax.put("roleIds", sysUser.getRoles().stream().map(SysRole::getRoleId).collect(Collectors.toList()));
			}
			return AjaxResult.success(ajax);
			}
			@@ -130,10 +131,10 @@
			if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(user.getUserName()))) {
			return AjaxResult.error("新增用户'" + user.getUserName() + "'失败，登录账号已存在");
			} else if (StringUtils.isNotEmpty(user.getPhonenumber())
			&& UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) {
			&& UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) {
			return AjaxResult.error("新增用户'" + user.getUserName() + "'失败，手机号码已存在");
			} else if (StringUtils.isNotEmpty(user.getEmail())
			&& UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user))) {
			&& UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user))) {
			return AjaxResult.error("新增用户'" + user.getUserName() + "'失败，邮箱账号已存在");
			}
			user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
			@@ -150,10 +151,10 @@
			public AjaxResult<Void> edit(@Validated @RequestBody SysUser user) {
			userService.checkUserAllowed(user);
			if (StringUtils.isNotEmpty(user.getPhonenumber())
			&& UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) {
			&& UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) {
			return AjaxResult.error("修改用户'" + user.getUserName() + "'失败，手机号码已存在");
			} else if (StringUtils.isNotEmpty(user.getEmail())
			&& UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user))) {
			&& UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user))) {
			return AjaxResult.error("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在");
			}
			return toAjax(userService.updateUser(user));