Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

lidongdong

2022-10-24 ff0d6cc27326837e5797ece1aa1a2c1bf0a9930f

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

@@ -1,24 +1,24 @@
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) {

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