From a9e199f7438588a4d686c109c2c92c735e2ab789 Mon Sep 17 00:00:00 2001 From: Caps <452713115@qq.com> Date: Fri, 24 Apr 2020 16:27:21 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E5=9B=9E=E8=B0=83=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/RetailCompanyService.java | 29 ++++++++++++++++--- .../com/kiisoo/ic/system/enums/RoleEnum.java | 2 ++ .../system/mapper/PrivilageUserDOMapper.java | 3 ++ .../mapper/PrivilageUserDOMapper.xml | 7 +++++ 4 files changed, 37 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/kiisoo/ic/generalize/service/RetailCompanyService.java b/src/main/java/com/kiisoo/ic/generalize/service/RetailCompanyService.java index d0641d5..63247bd 100644 --- a/src/main/java/com/kiisoo/ic/generalize/service/RetailCompanyService.java +++ b/src/main/java/com/kiisoo/ic/generalize/service/RetailCompanyService.java @@ -15,7 +15,9 @@ import com.kiisoo.ic.store.entity.PoiStore; import com.kiisoo.ic.store.entity.PoiStoreStaff; import com.kiisoo.ic.store.mapper.PoiStoreDOMapper; import com.kiisoo.ic.store.mapper.PoiStoreStaffDOMapper; +import com.kiisoo.ic.system.entity.PrivilageRoleDO; import com.kiisoo.ic.system.entity.PrivilageUserDO; +import com.kiisoo.ic.system.enums.RoleEnum; import com.kiisoo.ic.system.mapper.PrivilageUserDOMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -78,7 +80,9 @@ public class RetailCompanyService { public List getUserOrg(Long parentId, long userId, int level){ QueryWrapper wrapper1 = new QueryWrapper<>(); - wrapper1.eq("user_id",userId); + if(!check(userId)){ + wrapper1.eq("user_id",userId); + } PrivilageOrganizational p = new PrivilageOrganizational(); List pm = organizationalMemberMapper.selectList(wrapper1); QueryWrapper wrapper = new QueryWrapper<>(); @@ -100,7 +104,9 @@ public class RetailCompanyService { */ public List listOfBigRetailCompany(long userId){ QueryWrapper wrapper1 = new QueryWrapper<>(); - wrapper1.eq("user_id",userId); + if(!check(userId)){ + wrapper1.eq("user_id",userId); + } List pm = organizationalMemberMapper.selectList(wrapper1); QueryWrapper wrapper = new QueryWrapper<>(); if(pm.isEmpty()) { @@ -111,12 +117,25 @@ public class RetailCompanyService { } } + public boolean check(long userId){ + //根据userId查询角色 + PrivilageRoleDO p = privilageUserDOMapper.selecctRoleByUserId(userId); + if(p.getCode().equals(RoleEnum.ROLE_CODE_GLY.getRoleCode()) || p.getCode().equals(RoleEnum.ROLE_CODE_ALL_YYRY.getRoleCode()) ){ + return true; + }else { + return false; + } + } + + /** * 查询所有的组织数据信息 */ public List listOfRetailOrg(long userId, Long regionId, Long companyId, Long customerId){ QueryWrapper wrapper1 = new QueryWrapper<>(); - wrapper1.eq("user_id",userId); + if(!check(userId)){ + wrapper1.eq("user_id",userId); + } List pm = organizationalMemberMapper.selectList(wrapper1); if(pm.isEmpty()) { return new ArrayList<>(); @@ -158,7 +177,9 @@ public class RetailCompanyService { bigRegionId = null; } QueryWrapper wrapper1 = new QueryWrapper<>(); - wrapper1.eq("user_id",userId); + if(!check(userId)){ + wrapper1.eq("user_id",userId); + } List pm = organizationalMemberMapper.selectList(wrapper1); QueryWrapper wrapper = new QueryWrapper<>(); if(pm.isEmpty()) { diff --git a/src/main/java/com/kiisoo/ic/system/enums/RoleEnum.java b/src/main/java/com/kiisoo/ic/system/enums/RoleEnum.java index 29a65d9..9b1d1fd 100644 --- a/src/main/java/com/kiisoo/ic/system/enums/RoleEnum.java +++ b/src/main/java/com/kiisoo/ic/system/enums/RoleEnum.java @@ -15,6 +15,8 @@ public enum RoleEnum { ROLE_CODE_YYRY("运营人员", "DG-YUNYING"), + ROLE_CODE_ALL_YYRY("总运营人员", "GL-YUNYING"), + ROLE_CODE_GLY("系统管理员", "GLY-ADMIN"), ROLE_CODE_DG("导购", "DG-DAOGOU"), diff --git a/src/main/java/com/kiisoo/ic/system/mapper/PrivilageUserDOMapper.java b/src/main/java/com/kiisoo/ic/system/mapper/PrivilageUserDOMapper.java index b6bbdcc..b013940 100644 --- a/src/main/java/com/kiisoo/ic/system/mapper/PrivilageUserDOMapper.java +++ b/src/main/java/com/kiisoo/ic/system/mapper/PrivilageUserDOMapper.java @@ -2,6 +2,7 @@ package com.kiisoo.ic.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.kiisoo.ic.system.bean.PrivilageUserBean; +import com.kiisoo.ic.system.entity.PrivilageRoleDO; import com.kiisoo.ic.system.entity.PrivilageUserDO; import org.springframework.stereotype.Repository; @@ -14,4 +15,6 @@ import org.springframework.stereotype.Repository; public interface PrivilageUserDOMapper extends BaseMapper { PrivilageUserBean selectUserInfoAndRoleInfo(long userId); + + PrivilageRoleDO selecctRoleByUserId(long userId); } diff --git a/src/main/resources/mapper/PrivilageUserDOMapper.xml b/src/main/resources/mapper/PrivilageUserDOMapper.xml index adce192..97e6ea1 100644 --- a/src/main/resources/mapper/PrivilageUserDOMapper.xml +++ b/src/main/resources/mapper/PrivilageUserDOMapper.xml @@ -10,6 +10,13 @@ and t1.id = #{userId} limit 1 +