获取账户地图信息添加权限校验

kaiyu

2020-11-30 8bb0e02e8fd166f35782870983fd2140142df409

 src/main/java/com/moral/service/impl/AccountServiceImpl.java

@@ -14,6 +14,7 @@


import com.moral.entity.*;

import com.moral.mapper.DictionaryDataMapper;



import org.apache.commons.lang3.StringUtils;

import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;

import org.springframework.stereotype.Service;

@@ -73,6 +74,9 @@
                result.put("accountId", account.getId());

                result.put("orgId", account.getOrganizationId());

                result.put("data", menuList);

                String regionCode = getRegionCodeByAccount(account);

                if (!ObjectUtils.isEmpty(regionCode))

                    result.put("regionCode", regionCode);

                setOrgIdsByAccount(result);

            }

        }

@@ -396,11 +400,6 @@
            result.put("accountId", -1);

        } else {

            result = judgeAccountInfo(account);

            if (!result.get("accountId").equals(-1)){

                String regionCode = getRegionCodeByAccount(account);

                if(!ObjectUtils.isEmpty(regionCode))

                    result.put("regionCode",regionCode);

            }



        }

        return result;

@@ -423,7 +422,7 @@
        return (String) regionCodeAndType.get("regionCode");

    }



    public static Map<String,Object> getRegionCodeAndTypeByOrg(Organization organization){

    public  Map<String, Object> getRegionCodeAndTypeByOrg(Organization organization) {

        Map<String,Object> result = new HashMap<>();

        String regionCode = "";

        String regionType = "";