mirror of https://gitee.com/xiaonuobase/snowy
【修复】修复获取个人信息不返回移动端按钮码问题
parent
f577bae164
commit
6fee6f09de
|
@ -12,6 +12,8 @@
|
|||
*/
|
||||
package vip.xiaonuo.mobile.api;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 移动端按钮API
|
||||
*
|
||||
|
@ -20,4 +22,12 @@ package vip.xiaonuo.mobile.api;
|
|||
**/
|
||||
public interface MobileButtonApi {
|
||||
|
||||
/**
|
||||
* 根据键获取值
|
||||
*
|
||||
* @param idList
|
||||
* @author 每天一点
|
||||
* @date 2023/2/5 13:26
|
||||
**/
|
||||
List<String> listByIds(List<String> idList);
|
||||
}
|
||||
|
|
|
@ -12,8 +12,15 @@
|
|||
*/
|
||||
package vip.xiaonuo.mobile.modular.resource.provider;
|
||||
|
||||
import cn.hutool.core.util.ObjectUtil;
|
||||
import org.springframework.stereotype.Service;
|
||||
import vip.xiaonuo.mobile.api.MobileButtonApi;
|
||||
import vip.xiaonuo.mobile.modular.resource.entity.MobileButton;
|
||||
import vip.xiaonuo.mobile.modular.resource.service.MobileButtonService;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.List;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
/**
|
||||
* 移动端按钮API接口提供者
|
||||
|
@ -24,4 +31,14 @@ import vip.xiaonuo.mobile.api.MobileButtonApi;
|
|||
@Service
|
||||
public class MobileButtonApiProvider implements MobileButtonApi {
|
||||
|
||||
@Resource
|
||||
private MobileButtonService mobileButtonService;
|
||||
|
||||
@Override
|
||||
public List<String> listByIds(List<String> buttonIdList) {
|
||||
if (ObjectUtil.isEmpty(buttonIdList)) {
|
||||
return null;
|
||||
}
|
||||
return mobileButtonService.listByIds(buttonIdList).stream().map(MobileButton::getCode).collect(Collectors.toList());
|
||||
}
|
||||
}
|
||||
|
|
|
@ -24,6 +24,7 @@ import cn.hutool.core.convert.Convert;
|
|||
import cn.hutool.core.date.DateTime;
|
||||
import cn.hutool.core.img.ImgUtil;
|
||||
import cn.hutool.core.io.FileUtil;
|
||||
import cn.hutool.core.lang.Console;
|
||||
import cn.hutool.core.lang.tree.Tree;
|
||||
import cn.hutool.core.lang.tree.TreeNode;
|
||||
import cn.hutool.core.lang.tree.TreeNodeConfig;
|
||||
|
@ -56,6 +57,7 @@ import vip.xiaonuo.dev.api.DevConfigApi;
|
|||
import vip.xiaonuo.dev.api.DevEmailApi;
|
||||
import vip.xiaonuo.dev.api.DevMessageApi;
|
||||
import vip.xiaonuo.dev.api.DevSmsApi;
|
||||
import vip.xiaonuo.mobile.api.MobileButtonApi;
|
||||
import vip.xiaonuo.mobile.api.MobileMenuApi;
|
||||
import vip.xiaonuo.sys.core.enums.SysBuildInEnum;
|
||||
import vip.xiaonuo.sys.modular.org.entity.SysOrg;
|
||||
|
@ -146,6 +148,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
|
|||
@Resource
|
||||
private SysRelationService sysRelationService;
|
||||
|
||||
@Resource
|
||||
private MobileButtonApi mobileButtonApi;
|
||||
|
||||
@Override
|
||||
public SysLoginUser getUserById(String id) {
|
||||
SysUser sysUser = this.getById(id);
|
||||
|
@ -817,9 +822,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
|
|||
buttonIdList.addAll(JSONUtil.parseObj(sysRelation.getExtJson()).getBeanList("buttonInfo", String.class));
|
||||
}
|
||||
});
|
||||
if (ObjectUtil.isNotEmpty(buttonIdList)) {
|
||||
return sysButtonService.listByIds(buttonIdList).stream().map(SysButton::getCode).collect(Collectors.toList());
|
||||
}
|
||||
return mobileButtonApi.listByIds(buttonIdList);
|
||||
}
|
||||
return CollectionUtil.newArrayList();
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue