jinpengyong
2021-03-22 2dfd3bbb1b4976f0702b1adede273ad6c6939436
组菜单分配
4 files modified
11 ■■■■■ changed files
screen-api/src/main/java/com/moral/api/controller/MenuController.java 2 ●●● patch | view | raw | blame | history
screen-api/src/main/java/com/moral/api/service/impl/GroupMenuServiceImpl.java 2 ●●● patch | view | raw | blame | history
screen-api/src/main/java/com/moral/api/service/impl/MenuServiceImpl.java 3 ●●●● patch | view | raw | blame | history
screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java 4 ●●● patch | view | raw | blame | history
screen-api/src/main/java/com/moral/api/controller/MenuController.java
@@ -45,7 +45,7 @@
    @RequestMapping(value = "allotMenus", method = RequestMethod.POST)
    public ResultMessage allotMenus(HttpServletRequest request) {
        Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
        if (!parameters.containsKey("userId")) {
        if (!parameters.containsKey("groupId")) {
            return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
        }
        String token = request.getHeader("token");
screen-api/src/main/java/com/moral/api/service/impl/GroupMenuServiceImpl.java
@@ -6,7 +6,6 @@
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.moral.api.entity.GroupMenu;
import com.moral.api.entity.UserGroup;
import com.moral.api.mapper.GroupMenuMapper;
import com.moral.api.service.GroupMenuService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -47,6 +46,7 @@
                groupMenu.setMenuId(menuId);
                groupMenu.setChannel(Constants.WEB_CHANNEL);
                groupMenu.setOrganizationId((Integer) currentUserInfo.get("organizationId"));
                groupMenuMapper.insert(groupMenu);
            }
        }
    }
screen-api/src/main/java/com/moral/api/service/impl/MenuServiceImpl.java
@@ -30,7 +30,6 @@
    public Map<String, Object> selectMenusByOrgId(Integer orgId) {
        Map<String, Object> map = new HashMap<>();
        map.put("orgId",orgId);
        Map<String, Object> menus = userService.getMenus(map);
        return menus;
        return userService.getMenus(map);
    }
}
screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java
@@ -77,7 +77,7 @@
        //校验密码
        String password = parameters.get("password").toString();
        //密码解密
        //password = AESUtils.decrypt(password, AESKey);
        password = AESUtils.decrypt(password, AESKey);
        if (!MD5Utils.saltMD5Verify(password, userBo.getPassword())) {
            result.put("code", ResponseCodeEnum.PASSWORD_INVALID.getCode());
            result.put("msg", ResponseCodeEnum.PASSWORD_INVALID.getMsg());
@@ -165,7 +165,6 @@
    //获取用户层级菜单递归方法
    private List<Map<String, Object>> getMenusByRecursion(Menu menu, List<Menu> menus) {
        List<List<Map<String, Object>>> resultList = new ArrayList();
        Menu newMenu = new Menu();
        newMenu.setParentId(menu.getId());
        //筛选出下一级菜单信息
@@ -185,7 +184,6 @@
                menuMap.put("menus", getMenusByRecursion(o, menus));
                list.add(menuMap);
            });
            resultList.add(list);
        }
        return list;
    }