lidongdong
2022-10-17 5f1dc77585414a4b630b4b9637af29aed1ea14cc
修改登录角色获取权限 bug
5个文件已修改
26 ■■■■ 已修改文件
flower_city/src/main/java/com/dg/core/controller/UserController.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
flower_city/src/main/java/com/dg/core/db/gen/entity/SysUser.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
flower_city/src/main/java/com/dg/core/db/gen/mapper/SysUserMapper.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
flower_city/src/main/java/com/dg/core/service/impl/SysUserServiceImpl.java 9 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
flower_city/src/main/resources/mapper/SysUserMapper.xml 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
flower_city/src/main/java/com/dg/core/controller/UserController.java
@@ -100,6 +100,7 @@
            map.put("token", token);
            map.put("userId", user.getUserId());
            map.put("userName", user.getUserName());
            map.put("permission", user.getPermission());
            return ResultData.success(map);
        }
@@ -125,6 +126,7 @@
            map.put("token", token);
            map.put("userId", user.getUserId());
            map.put("userName", user.getUserName());
            map.put("permission", user.getPermission());
            return ResultData.success(map);
        }
flower_city/src/main/java/com/dg/core/db/gen/entity/SysUser.java
@@ -244,6 +244,10 @@
    private Integer transactionNum;
    @TableField(exist = false)
    @ApiModelProperty("权限资格")
    private String permission;
}
flower_city/src/main/java/com/dg/core/db/gen/mapper/SysUserMapper.java
@@ -18,6 +18,7 @@
public interface SysUserMapper extends BaseMapper<SysUser> {
    SysUser getUserById(Long id);
    SysUser getUserByAccount(String account);
    /**
flower_city/src/main/java/com/dg/core/service/impl/SysUserServiceImpl.java
@@ -49,13 +49,8 @@
    @Override
    public SysUser getUserByAccount(String account) {
        HashMap<String, Object> map = new HashMap();
        map.put("login_name", account);
        List<SysUser> sysUsers = baseMapper.selectByMap(map);
        if (sysUsers.size() > 0) {
            return sysUsers.get(0);
        }
        return null;
        SysUser sysUsers = baseMapper.getUserByAccount(account);
        return sysUsers;
    }
    @Override
flower_city/src/main/resources/mapper/SysUserMapper.xml
@@ -73,6 +73,7 @@
            transaction_names,
            openid,
            transaction_num,
            (select permission from automessage_role_management where automessage_role_management.id=role_ids) as permission,
            (select organization_name from automessage_organization_chart where automessage_sys_user.department_id=automessage_organization_chart.id) as department_name
        FROM
            automessage_sys_user
@@ -127,6 +128,15 @@
        </where>
    </select>
    <select id="getUserByAccount" parameterType="string"  resultMap="SysUserResult">
        <include refid="selectSysUserVo"/>
        <where>
            <if test="account!=null and account!='' ">
                login_name= #{account}
            </if>
        </where>
    </select>
    <select id="selectListByDepartmentId"  resultMap="SysUserResult">
        <include refid="selectSysUserVo"/>