|
|
@@ -7,6 +7,7 @@ import jp.yamoto.farm.common.core.domain.entity.SysMenu;
|
|
|
import jp.yamoto.farm.common.core.domain.entity.SysRole;
|
|
|
import jp.yamoto.farm.common.utils.SecurityUtils;
|
|
|
import jp.yamoto.farm.common.utils.StringUtils;
|
|
|
+import jp.yamoto.farm.common.utils.ValueUtils;
|
|
|
import jp.yamoto.farm.crm.biz.sys.domain.vo.MetaVo;
|
|
|
import jp.yamoto.farm.crm.biz.sys.domain.vo.RouterVo;
|
|
|
import jp.yamoto.farm.crm.biz.sys.mapper.SysMenuMapper;
|
|
|
@@ -128,7 +129,7 @@ public class SysMenuServiceImpl implements ISysMenuService {
|
|
|
@Override
|
|
|
public List<Long> selectMenuListByRoleId(Long roleId) {
|
|
|
SysRole role = roleMapper.selectRoleById(roleId);
|
|
|
- return menuMapper.selectMenuListByRoleId(roleId, role.getMenuCheckStrictly() == 1);
|
|
|
+ return menuMapper.selectMenuListByRoleId(roleId, (ValueUtils.isNotEmpty(role.getMenuCheckStrictly()) && role.getMenuCheckStrictly() == 1));
|
|
|
}
|
|
|
|
|
|
/**
|