Merge branch 'dev_New' of http://114.132.189.42:9002/r/product-inventory-ma...

huminmin

21 小时以前 c924d59a94fc17d570610cbf2b691481dd0b2e4d

 src/main/java/com/ruoyi/project/system/controller/SysUserController.java

@@ -5,6 +5,7 @@
import javax.servlet.http.HttpServletResponse;



import com.ruoyi.project.system.domain.vo.SysUserDeptVo;

import com.ruoyi.project.system.mapper.SysUserMapper;

import com.ruoyi.project.system.service.*;

import org.apache.commons.lang3.ArrayUtils;

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

@@ -65,6 +66,17 @@
        startPage();

        List<SysUser> list = userService.selectUserList(user);

        return getDataTable(list);

    }



    /**

     * 获取用户列表

     */

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

    @GetMapping("/listAll")

    public AjaxResult listAll(SysUser user)

    {

        List<SysUser> list = userService.selectUserList(user);

        return AjaxResult.success(list);

    }



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

@@ -145,6 +157,7 @@
        }

        user.setCreateBy(getUsername());

        user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));

        user.setTenantId(user.getDeptId());

        return toAjax(userService.insertUser(user));

    }