Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

chenlu

2024-05-13 d35d14bc183e7275e79cb64537ce28dc83f271f0

 north-glass-erp/src/main/java/com/example/erp/service/userInfo/PermissionBasicService.java

@@ -17,8 +17,8 @@
        this.permissionBasicMapper = permissionBasicMapper;
    }

    public List<PermissionBasic> getPermission(Integer userId, String lang, List<Integer> selectPageId) {
        return permissionBasicMapper.getPermission(userId,lang, selectPageId.get(1));
    public List<PermissionBasic> getPermission(Integer roleId, String lang, List<Integer> selectPageId) {
        return permissionBasicMapper.getPermission(roleId,lang, selectPageId.get(1));
    }

    public Object getPermissionList(String lang) {
@@ -26,11 +26,10 @@
        List<Map<String,Object>> ListOne = new ArrayList<>();

        for(PermissionBasic permissionBasic : getOne){

            Map<String,Object> map = new HashMap<>();
            map.put("value",permissionBasic.getId());
            map.put("label",permissionBasic.getMenu());
            map.put("children",permissionBasicMapper.selectTowLevel(permissionBasic.getMenu()));
            map.put("children",permissionBasicMapper.selectTowLevel(permissionBasic.getId()));
            ListOne.add(map);
        }