diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/controller/EmployeeController.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/controller/EmployeeController.java index 34644f5..e8da04b 100644 --- a/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/controller/EmployeeController.java +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/controller/EmployeeController.java @@ -119,7 +119,7 @@ public class EmployeeController { @Operation(summary = "修改密码 ") @PostMapping("/employee/update/password") -// @ApiDecrypt + @ApiDecrypt public ResponseDTO updatePassword(@Valid @RequestBody EmployeeUpdatePasswordForm updatePasswordForm) { updatePasswordForm.setEmployeeId(SmartRequestUtil.getRequestUserId()); return employeeService.updatePassword(SmartRequestUtil.getRequestUser(), updatePasswordForm); diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/menu/domain/vo/MenuVO.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/menu/domain/vo/MenuVO.java index e809bda..4e09f60 100644 --- a/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/menu/domain/vo/MenuVO.java +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/menu/domain/vo/MenuVO.java @@ -32,4 +32,7 @@ public class MenuVO extends MenuBaseForm { @Schema(description = "更新人") private Long updateUserId; + + @Schema(description = "字典数据") + private String platformTypeName; } diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/menu/service/MenuService.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/menu/service/MenuService.java index 753fee5..68d188f 100644 --- a/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/menu/service/MenuService.java +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/menu/service/MenuService.java @@ -2,6 +2,7 @@ package net.lab1024.sa.admin.module.system.menu.service; import cn.hutool.core.collection.CollectionUtil; import com.google.common.collect.Lists; +import net.lab1024.sa.admin.module.business.village.domain.vo.HomeVO; import net.lab1024.sa.admin.module.system.menu.constant.MenuTypeEnum; import net.lab1024.sa.admin.module.system.menu.dao.MenuDao; import net.lab1024.sa.admin.module.system.menu.domain.entity.MenuEntity; @@ -15,6 +16,9 @@ import net.lab1024.sa.base.common.domain.RequestUrlVO; import net.lab1024.sa.base.common.domain.ResponseDTO; import net.lab1024.sa.base.common.util.SmartBeanUtil; import net.lab1024.sa.base.common.util.SmartRequestUtil; +import net.lab1024.sa.base.module.support.dict.dao.DictValueDao; +import net.lab1024.sa.base.module.support.dict.domain.vo.DictValueVO; +import net.lab1024.sa.base.module.support.dict.service.DictCacheService; import org.apache.commons.lang3.math.NumberUtils; import org.apache.poi.ss.formula.functions.T; import org.springframework.stereotype.Service; @@ -40,6 +44,9 @@ public class MenuService { @Resource private MenuDao menuDao; + @Resource + private DictCacheService dictCacheService; + @Resource private List authUrl; @@ -167,6 +174,11 @@ public class MenuService { */ public List queryMenuList(Boolean disabledFlag) { List menuVOList = menuDao.queryMenuList(Boolean.FALSE, disabledFlag, null); + List property = dictCacheService.selectByKeyCode("PLATFORM_TYPE"); + for (MenuVO menuVO : menuVOList) { + List collect = property.stream().filter(d -> d.getValueCode().equals(menuVO.getPlatformType())).collect(Collectors.toList()); + menuVO.setPlatformTypeName(collect.size() > 0 ? collect.get(0).getValueName() : ""); + } //根据ParentId进行分组 Map> parentMap = menuVOList.stream().collect(Collectors.groupingBy(MenuVO::getParentId, Collectors.toList())); return this.filterNoParentMenu(parentMap, NumberUtils.LONG_ZERO);