Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-10-21 15fa429882915d83cb91a2b4e971ebdb46e1cbb6

 flower_city/src/main/java/com/dg/core/util/PermissionUtil.java

@@ -1,23 +1,23 @@
package com.dg.core.util;

import com.dg.core.controller.OrganizationController;
import com.dg.core.db.gen.entity.SysUser;
import com.dg.core.service.IOrganizationChartService;
import com.dg.core.service.impl.OrganizationChartImpl;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RestController;

import java.util.ArrayList;
import java.util.Collections;
import java.util.List;

@RestController
public class PermissionUtil
{

    @Autowired(required = true)
    static IOrganizationChartService iOrganizationChartService;


    public static List<String> getPermission(SysUser sysUser) {

    public static List<String> getPermission(SysUser sysUser,IOrganizationChartService iOrganizationChartService)
    {
        if (StringUtils.equals("3", sysUser.getRoleIds())) {
            if (StringUtils.isEmpty(sysUser.getDataPermission())) {
                return null;
@@ -46,7 +46,7 @@
        else if(StringUtils.equals("1", sysUser.getRoleIds()))
        {
            //管理员
            List<String> ids=iOrganizationChartService.getIds(null);
            List<String> ids=iOrganizationChartService.getIds("");
            return ids;
        }
        else