ZQN
2024-07-23 3860e5be6992552f26e567fe4a073e3efad37ba8
project-admin/src/main/java/com/project/admin/controller/system/SysUserController.java
@@ -53,7 +53,7 @@
    public TableDataInfo list(SysUser user)
    {
        startPage();
        List<SysUser> list = userService.selectUserList(user);
        List<SysUser> list = userService.selectUserListCommon(user);
        return getDataTable(list);
    }
@@ -62,7 +62,7 @@
    @PostMapping("/export")
    public void export(HttpServletResponse response, SysUser user)
    {
        List<SysUser> list = userService.selectUserList(user);
        List<SysUser> list = userService.selectUserListCommon(user);
        ExcelUtil<SysUser> util = new ExcelUtil<>(SysUser.class);
        util.exportExcel(response, list, "用户数据");
    }
@@ -120,6 +120,8 @@
            if (sysDept.getAncestors().contains("101") || sysDept.getDeptId().equals(101L)){
                user.setUserType("00");
                user.setRecommendPhone(deptService.getCheckDeptIdByLoginDeptId(user.getDeptId()).toString());
            } else {
                user.setUserType("01");
            }
        }
@@ -159,6 +161,8 @@
            SysDept sysDept = deptService.selectDeptById(user.getDeptId());
            if (sysDept.getAncestors().contains("101") || sysDept.getDeptId().equals(101L)){
                user.setUserType("00");
            } else {
                user.setUserType("01");
            }
        }
        if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(user)))
@@ -197,7 +201,7 @@
    /**
     * 重置密码
     */
    @PreAuthorize("@ss.hasPermi('system:user:resetPwd')")
//    @PreAuthorize("@ss.hasPermi('system:user:resetPwd')")
    @Log(title = "用户管理", businessType = BusinessType.UPDATE)
    @PutMapping("/resetPwd")
    public AjaxResult resetPwd(@RequestBody SysUser user)