admin/village_java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug修改

Browse Source
This commit is contained in:
pengjie 2025-06-09 18:36:13 +08:00
parent ce2053496b
commit f62cb27b88
3 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/controller/EmployeeController.java
View File

@ -119,7 +119,7 @@ public class EmployeeController {
@Operation(summary = "修改密码 ") @Operation(summary = "修改密码 ")
@PostMapping("/employee/update/password") @PostMapping("/employee/update/password")
// @ApiDecrypt @ApiDecrypt
public ResponseDTO<String> updatePassword(@Valid @RequestBody EmployeeUpdatePasswordForm updatePasswordForm) { public ResponseDTO<String> updatePassword(@Valid @RequestBody EmployeeUpdatePasswordForm updatePasswordForm) {
updatePasswordForm.setEmployeeId(SmartRequestUtil.getRequestUserId()); updatePasswordForm.setEmployeeId(SmartRequestUtil.getRequestUserId());
return employeeService.updatePassword(SmartRequestUtil.getRequestUser(), updatePasswordForm); return employeeService.updatePassword(SmartRequestUtil.getRequestUser(), updatePasswordForm);

3
sa-admin/src/main/java/net/lab1024/sa/admin/module/system/menu/domain/vo/MenuVO.java
View File

@ -32,4 +32,7 @@ public class MenuVO extends MenuBaseForm {
@Schema(description = "更新人") @Schema(description = "更新人")
private Long updateUserId; private Long updateUserId;
@Schema(description = "字典数据")
private String platformTypeName;
} }

12
sa-admin/src/main/java/net/lab1024/sa/admin/module/system/menu/service/MenuService.java
View File

@ -2,6 +2,7 @@ package net.lab1024.sa.admin.module.system.menu.service;
import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.collection.CollectionUtil;
import com.google.common.collect.Lists; 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.constant.MenuTypeEnum;
import net.lab1024.sa.admin.module.system.menu.dao.MenuDao; import net.lab1024.sa.admin.module.system.menu.dao.MenuDao;
import net.lab1024.sa.admin.module.system.menu.domain.entity.MenuEntity; 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.domain.ResponseDTO;
import net.lab1024.sa.base.common.util.SmartBeanUtil; import net.lab1024.sa.base.common.util.SmartBeanUtil;
import net.lab1024.sa.base.common.util.SmartRequestUtil; 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.commons.lang3.math.NumberUtils;
import org.apache.poi.ss.formula.functions.T; import org.apache.poi.ss.formula.functions.T;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@ -40,6 +44,9 @@ public class MenuService {
@Resource @Resource
private MenuDao menuDao; private MenuDao menuDao;
@Resource
private DictCacheService dictCacheService;
@Resource @Resource
private List<RequestUrlVO> authUrl; private List<RequestUrlVO> authUrl;
@ -167,6 +174,11 @@ public class MenuService {
*/ */
public List<MenuVO> queryMenuList(Boolean disabledFlag) { public List<MenuVO> queryMenuList(Boolean disabledFlag) {
List<MenuVO> menuVOList = menuDao.queryMenuList(Boolean.FALSE, disabledFlag, null); List<MenuVO> menuVOList = menuDao.queryMenuList(Boolean.FALSE, disabledFlag, null);
List<DictValueVO> property = dictCacheService.selectByKeyCode("PLATFORM_TYPE");
for (MenuVO menuVO : menuVOList) {
List<DictValueVO> collect = property.stream().filter(d -> d.getValueCode().equals(menuVO.getPlatformType())).collect(Collectors.toList());
menuVO.setPlatformTypeName(collect.size() > 0 ? collect.get(0).getValueName() : "");
}
//根据ParentId进行分组 //根据ParentId进行分组
Map<Long, List<MenuVO>> parentMap = menuVOList.stream().collect(Collectors.groupingBy(MenuVO::getParentId, Collectors.toList())); Map<Long, List<MenuVO>> parentMap = menuVOList.stream().collect(Collectors.groupingBy(MenuVO::getParentId, Collectors.toList()));
return this.filterNoParentMenu(parentMap, NumberUtils.LONG_ZERO); return this.filterNoParentMenu(parentMap, NumberUtils.LONG_ZERO);