补充登录角色

lbq

19 小时以前 5a4419d146e4ac48fd0e3ed89ab64e64cad192d1

 rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java

@@ -129,6 +129,8 @@
    private WarehouseRoleMenuService warehouseRoleMenuService;
    @Autowired
    private BasContainerService basContainerService;
    @Resource
    private UserRoleService userRoleService;

    /**
     * @return
@@ -157,6 +159,14 @@
        if (!userService.comparePassword(user.getPassword(), param.getPassword())) {
            return R.parse(CodeRes.USER_10003);
        }

        List<Role> roles = userRoleService.listByUserId(user.getId());
        user.setRoles(roles);
        Long[] roleIds = new Long[roles.size()];
        for(int i = 0; i < roles.size(); i++) {
            roleIds[i] = roles.get(i).getId();
        }
        user.setRoleIds(roleIds);

        String accessToken = JwtUtil.buildToken(new JwtSubject(param.getUsername(), user.getTenantId()),
                configProperties.getTokenExpireTime(), configProperties.getTokenKey());
@@ -1026,7 +1036,7 @@
                        .map(WarehouseRoleMenu::getMenuId)
                        .collect(Collectors.toSet());
                // 获取 areaList 并转换为 Long 类型的 Set
                List<Integer> areaList = container.getAreas();
                List<Integer> areaList = container.getAreasIds();
                Set<Long> areaSet = new HashSet<>();
                if (areaList != null) {
                    areaList.forEach(area -> areaSet.add(area.longValue()));
@@ -1066,7 +1076,7 @@
                        .map(WarehouseRoleMenu::getMenuId)
                        .collect(Collectors.toSet());
                // 获取 areaList 并转换为 Long 类型的 Set
                List<Integer> areaList = container.getAreas();
                List<Integer> areaList = container.getAreasIds();
                Set<Long> areaSet = new HashSet<>();
                if (areaList != null) {
                    areaList.forEach(area -> areaSet.add(area.longValue()));