From db123e0fbff0926223e0518a0c6026117b2b254a Mon Sep 17 00:00:00 2001 From: Caps <452713115@qq.com> Date: Fri, 24 Apr 2020 13:47:34 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B4=A6=E6=88=B7=E6=9D=83=E9=99=90=E7=AE=A1?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/PrivilageDomainService.java | 7 +++++ .../impl/PrivilageDomainServiceImpl.java | 27 +++++++++++++++++ .../kiisoo/ic/system/bean/AccountBean.java | 5 +++- .../ic/system/bean/ModifyAccountInput.java | 5 ++++ .../impl/PrivilageAccountServiceImpl.java | 29 +++++++++++++++++-- 5 files changed, 69 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/kiisoo/ic/domain/service/PrivilageDomainService.java b/src/main/java/com/kiisoo/ic/domain/service/PrivilageDomainService.java index c531e95..8efe5b4 100644 --- a/src/main/java/com/kiisoo/ic/domain/service/PrivilageDomainService.java +++ b/src/main/java/com/kiisoo/ic/domain/service/PrivilageDomainService.java @@ -40,6 +40,13 @@ public interface PrivilageDomainService extends IService { */ void saveAllDate(Long userId, long roleId); + /** + * 保存运营人员绑定零售公司数据 + * @param userId + * @param companyId + */ + void saveRoleY(Long userId,Long companyId); + /** * 数据权限-维护单店权限 * @param staffCode diff --git a/src/main/java/com/kiisoo/ic/domain/service/impl/PrivilageDomainServiceImpl.java b/src/main/java/com/kiisoo/ic/domain/service/impl/PrivilageDomainServiceImpl.java index bad0b2a..eea8ec8 100644 --- a/src/main/java/com/kiisoo/ic/domain/service/impl/PrivilageDomainServiceImpl.java +++ b/src/main/java/com/kiisoo/ic/domain/service/impl/PrivilageDomainServiceImpl.java @@ -1,7 +1,9 @@ package com.kiisoo.ic.domain.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.kiisoo.ic.common.DataConstants; +import com.kiisoo.ic.constants.Constants; import com.kiisoo.ic.domain.entity.PrivilageDomainDO; import com.kiisoo.ic.domain.entity.PrivilageDomainEntityDO; import com.kiisoo.ic.domain.entity.PrivilageUserDomainDO; @@ -10,6 +12,8 @@ import com.kiisoo.ic.domain.mapper.PrivilageDomainDOMapper; import com.kiisoo.ic.domain.mapper.PrivilageDomainEntityDOMapper; import com.kiisoo.ic.domain.mapper.PrivilageUserDomainDOMapper; import com.kiisoo.ic.domain.service.PrivilageDomainService; +import com.kiisoo.ic.generalize.entity.PrivilageOrganizationalMember; +import com.kiisoo.ic.generalize.mapper.OrganizationalMemberMapper; import com.kiisoo.ic.store.mapper.PoiStoreStaffDOMapper; import com.kiisoo.ic.system.entity.PrivilageRoleDO; import com.kiisoo.ic.system.enums.RoleEnum; @@ -46,6 +50,8 @@ public class PrivilageDomainServiceImpl extends ServiceImpl wrapper = new QueryWrapper<>(); + wrapper.eq("user_id",userId); + PrivilageOrganizationalMember privilageOrganizationalMember = organizationalMemberMapper.selectOne(wrapper); + PrivilageOrganizationalMember privilageOrganizationalMember1 = new PrivilageOrganizationalMember(); + privilageOrganizationalMember1.setOrgId(companyId); + privilageOrganizationalMember1.setUserId(userId); + privilageOrganizationalMember1.setCreateTime(new Date()); + privilageOrganizationalMember1.setUpdateTime(new Date()); + privilageOrganizationalMember1.setCreateBy(Constants.SYS_OPERATION); + privilageOrganizationalMember1.setUpdateBy(Constants.SYS_OPERATION); + + if(privilageOrganizationalMember == null){ + organizationalMemberMapper.insert(privilageOrganizationalMember1); + }else { + privilageOrganizationalMember1.setId(privilageOrganizationalMember.getId()); + organizationalMemberMapper.updateById(privilageOrganizationalMember1); + } + } + @Override public void saveOneShop(long userId,String staffCode, long shopId,Long type) { privilageUserService.saveUserShopRelation(userId,staffCode,shopId,type); diff --git a/src/main/java/com/kiisoo/ic/system/bean/AccountBean.java b/src/main/java/com/kiisoo/ic/system/bean/AccountBean.java index 9f68eaa..80c90dd 100644 --- a/src/main/java/com/kiisoo/ic/system/bean/AccountBean.java +++ b/src/main/java/com/kiisoo/ic/system/bean/AccountBean.java @@ -73,5 +73,8 @@ public class AccountBean { */ private String roleCode; - + /** + * 零售公司id + */ + private Long orgId; } diff --git a/src/main/java/com/kiisoo/ic/system/bean/ModifyAccountInput.java b/src/main/java/com/kiisoo/ic/system/bean/ModifyAccountInput.java index 795d6e4..ab957bb 100644 --- a/src/main/java/com/kiisoo/ic/system/bean/ModifyAccountInput.java +++ b/src/main/java/com/kiisoo/ic/system/bean/ModifyAccountInput.java @@ -60,4 +60,9 @@ public class ModifyAccountInput { * 人员编号 */ private String staffCode; + + /** + * 零售公司id + */ + private Long companyId; } diff --git a/src/main/java/com/kiisoo/ic/system/service/impl/PrivilageAccountServiceImpl.java b/src/main/java/com/kiisoo/ic/system/service/impl/PrivilageAccountServiceImpl.java index 722b676..6fa435a 100644 --- a/src/main/java/com/kiisoo/ic/system/service/impl/PrivilageAccountServiceImpl.java +++ b/src/main/java/com/kiisoo/ic/system/service/impl/PrivilageAccountServiceImpl.java @@ -7,6 +7,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.kiisoo.ic.common.utils.MD5FileUtil; import com.kiisoo.ic.constants.Constants; import com.kiisoo.ic.domain.service.PrivilageDomainService; +import com.kiisoo.ic.generalize.entity.PrivilageOrganizationalMember; +import com.kiisoo.ic.generalize.mapper.OrganizationalMemberMapper; +import com.kiisoo.ic.generalize.service.RetailCompanyService; import com.kiisoo.ic.store.entity.PoiStore; import com.kiisoo.ic.store.entity.PoiStoreStaff; import com.kiisoo.ic.store.mapper.PoiStoreDOMapper; @@ -41,6 +44,7 @@ import java.io.IOException; import java.io.InputStream; import java.text.SimpleDateFormat; import java.util.*; +import java.util.stream.Collectors; import static java.util.stream.Collectors.toList; @@ -85,8 +89,15 @@ public class PrivilageAccountServiceImpl extends ServiceImpl wrapper = new QueryWrapper<>(); + wrapper.eq("user_id",userId).last("limit 1"); + PrivilageOrganizationalMember p1 = organizationalMemberMapper.selectOne(wrapper); + if(p1 != null){ + accountBean.setOrgId(p1.getOrgId()); + List list1 = retailCompanyService.selectShopByCompany(p1.getOrgId()); + List str = list1.stream().map(PoiStore::getName).collect(toList()); + accountBean.setShopName(str.toString().replace("[","").replace("]","")); + } + } //店长角色查询店铺信息和渠道 if (roleCode.equals(RoleEnum.ROLE_CODE_DZ.getRoleCode()) || roleCode.equals(RoleEnum.ROLE_CODE_DG.getRoleCode())) { QueryWrapper wrapper = new QueryWrapper<>();