Merge remote-tracking branch 'origin/dev_tide' into dev_tide

maven

2 天以前 a20dad0f0702e192bee8b80c6237a0e9bb7d8b66

Merge remote-tracking branch 'origin/dev_tide' into dev_tide

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

@@ -145,6 +145,7 @@
            return error("新增用户'" + user.getUserName() + "'失败，邮箱账号已存在");

        }

        user.setCreateBy(getUsername());

        user.setTenantId(SecurityUtils.getLoginUser().getTenantId());

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

        return toAjax(userService.insertUser(user));

    }

@@ -279,8 +280,8 @@
    @GetMapping("/userListNoPageByTenantId")

    public AjaxResult userListNoPageByTenantId(SysUser user){

        //获取登录用户信息

        SysUser loginUser = SecurityUtils.getLoginUser().getUser();

        user.setTenantId(loginUser.getTenantId());

//        SysUser loginUser = SecurityUtils.getLoginUser().getUser();

        user.setTenantId(SecurityUtils.getLoginUser().getTenantId());

        List<SysUser> sysUserList = userService.userListNoPage(user);

        return AjaxResult.success(sysUserList);

    }


 src/main/java/com/ruoyi/project/system/service/impl/SysUserServiceImpl.java

@@ -72,7 +72,7 @@
     * @return 用户信息集合信息

     */

    @Override

    @DataScope(deptAlias = "d", userAlias = "u")

    @DataScope(tenantIdFelid = "u")

    public List<SysUser> selectUserList(SysUser user)

    {

        return userMapper.selectUserList(user);


 src/main/resources/mapper/system/SysUserMapper.xml

@@ -57,7 +57,7 @@
    
    <select id="selectUserList" parameterType="com.ruoyi.project.system.domain.SysUser" resultMap="SysUserResult">
        select u.user_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,T2.dept_names from sys_user u
        left join
        inner join
        (    SELECT T1.user_id,GROUP_CONCAT(T2.dept_name SEPARATOR ', ') AS dept_names
            FROM
                sys_user_dept T1