From ef18dd3dc4a97f172b2cdd1a21f8b71951b2d398 Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Tue, 13 Aug 2024 13:00:32 +0800 Subject: [PATCH] for gz --- .../bonus/sgzb/common/core/constant/Constants.java | 10 ++++++++++ .../sgzb/system/service/impl/SysDeptServiceImpl.java | 11 +++++++++++ 2 files changed, 21 insertions(+) diff --git a/sgzb-common/sgzb-common-core/src/main/java/com/bonus/sgzb/common/core/constant/Constants.java b/sgzb-common/sgzb-common-core/src/main/java/com/bonus/sgzb/common/core/constant/Constants.java index e282522..e1b3bbe 100644 --- a/sgzb-common/sgzb-common-core/src/main/java/com/bonus/sgzb/common/core/constant/Constants.java +++ b/sgzb-common/sgzb-common-core/src/main/java/com/bonus/sgzb/common/core/constant/Constants.java @@ -7,6 +7,16 @@ package com.bonus.sgzb.common.core.constant; */ public class Constants { + /** + * 广州仓储 + */ + public static final String CUSTOMER_GZ = "gz"; + + /** + * 重庆机具 + */ + public static final String CUSTOMER_CQ = "cq"; + /** * UTF-8 字符集 */ diff --git a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/SysDeptServiceImpl.java b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/SysDeptServiceImpl.java index 75ebb4d..fa1de63 100644 --- a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/SysDeptServiceImpl.java +++ b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/SysDeptServiceImpl.java @@ -1,5 +1,6 @@ package com.bonus.sgzb.system.service.impl; +import com.bonus.sgzb.common.core.constant.Constants; import com.bonus.sgzb.common.core.constant.UserConstants; import com.bonus.sgzb.common.core.exception.ServiceException; import com.bonus.sgzb.common.core.text.Convert; @@ -17,6 +18,7 @@ import com.bonus.sgzb.system.mapper.SysRoleMapper; import com.bonus.sgzb.system.mapper.SysUserMapper; import com.bonus.sgzb.system.service.ISysDeptService; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -33,6 +35,10 @@ import java.util.stream.Collectors; */ @Service public class SysDeptServiceImpl implements ISysDeptService { + + @Value("${sgzb.customer}") + private String customer; + @Resource private SysDeptMapper deptMapper; @@ -51,6 +57,11 @@ public class SysDeptServiceImpl implements ISysDeptService { @Override @DataScope(deptAlias = "d") public List selectDeptList(SysDept dept) { + if (Constants.CUSTOMER_GZ.equals(customer)) { + LoginUser loginUser = SecurityUtils.getLoginUser(); + SysUser sysUser = loginUser.getSysUser(); + dept.setCompanyId(Objects.nonNull(sysUser) ? sysUser.getCompanyId() : null); + } return deptMapper.selectDeptList(dept); }