分支自 ~yxh/smartor
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
liusheng
2024-06-27 afb277a81e060c6275f11e9f9f102b5dcfd80a72 
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java


@@ -1,21 +1,5 @@


package com.ruoyi.web.controller.system;




import java.util.List;


import java.util.stream.Collectors;


import javax.servlet.http.HttpServletResponse;


import org.apache.commons.lang3.ArrayUtils;


import org.springframework.beans.factory.annotation.Autowired;


import org.springframework.security.access.prepost.PreAuthorize;


import org.springframework.validation.annotation.Validated;


import org.springframework.web.bind.annotation.DeleteMapping;


import org.springframework.web.bind.annotation.GetMapping;


import org.springframework.web.bind.annotation.PathVariable;


import org.springframework.web.bind.annotation.PostMapping;


import org.springframework.web.bind.annotation.PutMapping;


import org.springframework.web.bind.annotation.RequestBody;


import org.springframework.web.bind.annotation.RequestMapping;


import org.springframework.web.bind.annotation.RestController;


import org.springframework.web.multipart.MultipartFile;


import com.ruoyi.common.annotation.Log;


import com.ruoyi.common.constant.UserConstants;


import com.ruoyi.common.core.controller.BaseController;


@@ -32,6 +16,16 @@


import com.ruoyi.system.service.ISysPostService;


import com.ruoyi.system.service.ISysRoleService;


import com.ruoyi.system.service.ISysUserService;


import org.apache.commons.lang3.ArrayUtils;


import org.springframework.beans.factory.annotation.Autowired;


import org.springframework.security.access.prepost.PreAuthorize;


import org.springframework.validation.annotation.Validated;


import org.springframework.web.bind.annotation.*;


import org.springframework.web.multipart.MultipartFile;




import javax.servlet.http.HttpServletResponse;


import java.util.List;


import java.util.stream.Collectors;




/**


 * 用户信息


@@ -122,7 +116,7 @@


     */


    @PreAuthorize("@ss.hasPermi('system:user:add')")


    @Log(title = "用户管理", businessType = BusinessType.INSERT)


    @PostMapping


    @PostMapping("/add")


    public AjaxResult add(@Validated @RequestBody SysUser user)


    {


        if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(user)))


@@ -149,7 +143,7 @@


     */


    @PreAuthorize("@ss.hasPermi('system:user:edit')")


    @Log(title = "用户管理", businessType = BusinessType.UPDATE)


    @PostMapping


    @PostMapping("/edit")


    public AjaxResult edit(@Validated @RequestBody SysUser user)


    {


        userService.checkUserAllowed(user);