bug 修复

zhongrj

2023-12-28 8dab1f5e6ae80f6808d818ba799d38bb0ef4e699

bug 修复

 src/main/java/org/springblade/common/constant/CommonConstant.java

@@ -88,5 +88,7 @@

    Integer NUMBER_THREE = 3;

    String RESIDENT = "居民";


}

 src/main/java/org/springblade/modules/system/controller/MenuController.java

@@ -138,8 +138,8 @@
     */
    @GetMapping("/dynamicMenu")
    @ApiOperation(value = "菜单列表", notes = "传入menu")
    public R<List<MenuVO>> dynamicMenu(String roleId, Long topMenuId, @RequestParam(value = "labelType", required = false,defaultValue = "0") Integer labelType) {
        List<MenuVO> list = menuService.routes(roleId, topMenuId,labelType,1);
    public R<List<MenuVO>> dynamicMenu(String roleId, Long topMenuId, @RequestParam(value = "labelType", required = false,defaultValue = "0") Integer labelType, @RequestParam(value = "roleName",required = false) String roleName) {
        List<MenuVO> list = menuService.routes(roleId, topMenuId,labelType,1,roleName);
        return R.data(list);
    }

@@ -200,7 +200,7 @@
    @ApiOperationSupport(order = 8)
    @ApiOperation(value = "前端菜单数据", notes = "前端菜单数据")
    public R<List<MenuVO>> routes(BladeUser user, Long topMenuId) {
        List<MenuVO> list = menuService.routes((user == null) ? null : user.getRoleId(), topMenuId,null,0);
        List<MenuVO> list = menuService.routes((user == null) ? null : user.getRoleId(), topMenuId,null,0,"");
        return R.data(list);
    }


 src/main/java/org/springblade/modules/system/service/IMenuService.java

@@ -59,7 +59,7 @@
     * @param topMenuId
     * @return
     */
    List<MenuVO> routes(String roleId, Long topMenuId,Integer labelType,Integer menuType);
    List<MenuVO> routes(String roleId, Long topMenuId,Integer labelType,Integer menuType,String roleName);

    /**
     * 菜单树形结构

 src/main/java/org/springblade/modules/system/service/impl/MenuServiceImpl.java

@@ -84,8 +84,8 @@
        }
        List<MenuVO> menuVOS = baseMapper.lazyList(parentId, param);
        for (MenuVO menuVO : menuVOS) {
            if(StringUtils.isNotBlank(menuVO.getLabelStr())){
                List<List<String>> lists = (List<List<String>>)JSON.parse(menuVO.getLabelStr() );
            if (StringUtils.isNotBlank(menuVO.getLabelStr())) {
                List<List<String>> lists = (List<List<String>>) JSON.parse(menuVO.getLabelStr());
                menuVO.setLabelList(lists);
            }
        }
@@ -99,8 +99,8 @@
        }
        List<MenuVO> menuVOS = baseMapper.lazyList(parentId, param);
        for (MenuVO menuVO : menuVOS) {
            if(StringUtils.isNotBlank(menuVO.getLabelStr())){
                List<List<String>> lists = (List<List<String>>)JSON.parse(menuVO.getLabelStr() );
            if (StringUtils.isNotBlank(menuVO.getLabelStr())) {
                List<List<String>> lists = (List<List<String>>) JSON.parse(menuVO.getLabelStr());
                menuVO.setLabelList(lists);
            }
        }
@@ -112,11 +112,11 @@


    @Override
    public List<MenuVO> routes(String roleId, Long topMenuId, Integer labelType,Integer menuType) {
    public List<MenuVO> routes(String roleId, Long topMenuId, Integer labelType, Integer menuType, String roleName) {
        if (StringUtil.isBlank(roleId)) {
            return null;
        }
        List<Menu> allMenus = baseMapper.selectList(Wrappers.<Menu>lambdaQuery().eq(Menu::getCategory,1).eq(Menu::getMenuType,menuType));
        List<Menu> allMenus = baseMapper.selectList(Wrappers.<Menu>lambdaQuery().eq(Menu::getCategory, 1).eq(Menu::getMenuType, menuType));
        List<Menu> roleMenus;
        // 超级管理员并且不是顶部菜单请求则返回全部菜单
        if (AuthUtil.isAdministrator() && Func.isEmpty(topMenuId)) {
@@ -126,14 +126,14 @@
        else if (!AuthUtil.isAdministrator() && Func.isEmpty(topMenuId)) {
            roleMenus = tenantPackageMenu(baseMapper.roleMenuByRoleId(Func.toLongList(roleId), menuType));
            // 1:居民，居民需要通过人的标签来显示取保候审
            if(CommonConstant.NUMBER_ONE.equals(labelType)){
            if (CommonConstant.RESIDENT.equals(roleName)) {
                extracted(labelType, roleMenus);
            }
        }
        // 顶部菜单请求返回对应角色权限菜单
        else {
            // 角色配置对应菜单
            List<Menu> roleIdMenus = baseMapper.roleMenuByRoleId(Func.toLongList(roleId),menuType);
            List<Menu> roleIdMenus = baseMapper.roleMenuByRoleId(Func.toLongList(roleId), menuType);
            // 反向递归角色菜单所有父级
            List<Menu> routes = new LinkedList<>(roleIdMenus);
            roleIdMenus.forEach(roleMenu -> recursion(allMenus, routes, roleMenu));
@@ -150,6 +150,7 @@

    /**
     * 房屋的时候才通过人的标签过滤
     *
     * @param roleMenus
     * @param labelType
     */
@@ -169,10 +170,9 @@
                    if (union.size() == 0) {
                        iterator.remove();
                    }
                } else {
                    if (next.getName().trim().equals("取保候审")) {
                        iterator.remove();
                    }
                }
                if (next.getName().trim().equals("取保候审") && CommonConstant.NUMBER_ZERO.equals(labelType)) {
                    iterator.remove();
                }
            }
        }
@@ -345,7 +345,7 @@
                wrapper -> wrapper.eq(Menu::getName, menu.getName()).eq(Menu::getCategory, MENU_CATEGORY)
            );
        } else {
            menuQueryWrapper.ne(Menu::getId, menu.getId()).eq(Menu::getIsDeleted,0).and(
            menuQueryWrapper.ne(Menu::getId, menu.getId()).eq(Menu::getIsDeleted, 0).and(
                wrapper -> wrapper.eq(Menu::getCode, menu.getCode()).or(
                    o -> o.eq(Menu::getName, menu.getName()).eq(Menu::getCategory, MENU_CATEGORY)
                )
@@ -368,7 +368,7 @@
        List<List<String>> labelList = menu.getLabelList();
        StringBuffer stringBuffer = new StringBuffer();
        for (List<String> strings : labelList) {
            stringBuffer.append(strings.get(strings.size()-1)).append(",");
            stringBuffer.append(strings.get(strings.size() - 1)).append(",");
        }
        menu.setLabelId(stringBuffer.toString());
        menu.setIsDeleted(BladeConstant.DB_NOT_DELETED);

 src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml

@@ -22,7 +22,7 @@

    <select id="selectTaskPage" resultMap="taskResultMap">
        SELECT
        IFNULL(jda.address_name,jp.localtion)address_name ,
        IFNULL(jda.address_name,jp.location)address_name ,
        jt.id,
        jt.name,
        jt.type,

 src/main/java/org/springblade/modules/task/service/impl/TaskRepairStepServiceImpl.java

@@ -78,7 +78,7 @@
        taskReportForRepairsEntity.setConfirmFlag(task.getConfirmFlag());
        taskReportForRepairsEntity.setConfirmUserId(task.getTransferUserId());
        if (CommonConstant.NUMBER_ZERO.equals(task.getConfirmFlag())|| CommonConstant.NUMBER_THREE.equals(task.getConfirmFlag())) {
            task.setName(AuthUtil.getNickName());
            task.setName(AuthUtil.getUserName());
        }
        SpringUtils.getBean(ITaskReportForRepairsService.class).updateById(taskReportForRepairsEntity);
        return save(task);