mirror of
http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git
synced 2026-08-12 21:02:08 +08:00
1、无权限用户菜单展示错误修复;2、用户性别、板材-纹理/宽度/长度/品牌/规格/价格/备注缺省值可null修复;3、全局DefaultDBFieldHandler自动填充移除数值类型的自动填充;4、补充默认的i18文件message.properties;
This commit is contained in:
+9
-5
@@ -46,6 +46,8 @@ import jakarta.annotation.security.PermitAll;
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
import jakarta.validation.Valid;
|
||||
import jakarta.validation.constraints.NotEmpty;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
@@ -162,11 +164,13 @@ public class AuthController {
|
||||
|
||||
// 1.3 获得菜单列表
|
||||
Set<Long> menuIds = permissionService.getRoleMenuListByRoleId2(convertSet(roles, RoleDO::getId), loginUser.getOrganId());
|
||||
List<MenuDO> menuList;
|
||||
if(SecurityFrameworkUtils.isManageEndPoint()){
|
||||
menuList = menuService.getManageEndPointMenuList(menuIds);
|
||||
} else {
|
||||
menuList = menuService.getCustomEndPointMenuList(menuIds);
|
||||
List<MenuDO> menuList = new ArrayList<>();
|
||||
if (CollUtil.isNotEmpty(menuIds)) {
|
||||
if (SecurityFrameworkUtils.isManageEndPoint()) {
|
||||
menuList = menuService.getManageEndPointMenuList(menuIds);
|
||||
} else {
|
||||
menuList = menuService.getCustomEndPointMenuList(menuIds);
|
||||
}
|
||||
}
|
||||
menuList.removeIf(menu -> !CommonStatusEnum.ENABLE.getStatus().equals(menu.getStatus())); // 移除禁用的菜单
|
||||
|
||||
|
||||
Reference in New Issue
Block a user