【修复】修复获取个人信息不返回移动端按钮码问题

pull/84/MERGE
每天一点 2023-02-05 13:30:11 +08:00
parent f577bae164
commit 6fee6f09de
3 changed files with 33 additions and 3 deletions

View File

@ -12,6 +12,8 @@
*/ */
package vip.xiaonuo.mobile.api; package vip.xiaonuo.mobile.api;
import java.util.List;
/** /**
* API * API
* *
@ -20,4 +22,12 @@ package vip.xiaonuo.mobile.api;
**/ **/
public interface MobileButtonApi { public interface MobileButtonApi {
/**
*
*
* @param idList
* @author
* @date 2023/2/5 13:26
**/
List<String> listByIds(List<String> idList);
} }

View File

@ -12,8 +12,15 @@
*/ */
package vip.xiaonuo.mobile.modular.resource.provider; package vip.xiaonuo.mobile.modular.resource.provider;
import cn.hutool.core.util.ObjectUtil;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import vip.xiaonuo.mobile.api.MobileButtonApi; 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 * API
@ -24,4 +31,14 @@ import vip.xiaonuo.mobile.api.MobileButtonApi;
@Service @Service
public class MobileButtonApiProvider implements MobileButtonApi { 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());
}
} }

View File

@ -24,6 +24,7 @@ import cn.hutool.core.convert.Convert;
import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateTime;
import cn.hutool.core.img.ImgUtil; import cn.hutool.core.img.ImgUtil;
import cn.hutool.core.io.FileUtil; 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.Tree;
import cn.hutool.core.lang.tree.TreeNode; import cn.hutool.core.lang.tree.TreeNode;
import cn.hutool.core.lang.tree.TreeNodeConfig; 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.DevEmailApi;
import vip.xiaonuo.dev.api.DevMessageApi; import vip.xiaonuo.dev.api.DevMessageApi;
import vip.xiaonuo.dev.api.DevSmsApi; import vip.xiaonuo.dev.api.DevSmsApi;
import vip.xiaonuo.mobile.api.MobileButtonApi;
import vip.xiaonuo.mobile.api.MobileMenuApi; import vip.xiaonuo.mobile.api.MobileMenuApi;
import vip.xiaonuo.sys.core.enums.SysBuildInEnum; import vip.xiaonuo.sys.core.enums.SysBuildInEnum;
import vip.xiaonuo.sys.modular.org.entity.SysOrg; import vip.xiaonuo.sys.modular.org.entity.SysOrg;
@ -146,6 +148,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
@Resource @Resource
private SysRelationService sysRelationService; private SysRelationService sysRelationService;
@Resource
private MobileButtonApi mobileButtonApi;
@Override @Override
public SysLoginUser getUserById(String id) { public SysLoginUser getUserById(String id) {
SysUser sysUser = this.getById(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)); buttonIdList.addAll(JSONUtil.parseObj(sysRelation.getExtJson()).getBeanList("buttonInfo", String.class));
} }
}); });
if (ObjectUtil.isNotEmpty(buttonIdList)) { return mobileButtonApi.listByIds(buttonIdList);
return sysButtonService.listByIds(buttonIdList).stream().map(SysButton::getCode).collect(Collectors.toList());
}
} }
return CollectionUtil.newArrayList(); return CollectionUtil.newArrayList();
} }