From 24e9629cce9a1bd9510a1c29c6379a1d1a1f7b7a Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Tue, 26 Jan 2021 23:55:56 +0800
Subject: [PATCH] 公司隔离字段新增
---
zq-erp/src/main/resources/mybatis/mapper/hive/SysVipInfoDao.xml | 6 +++---
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysVipInfoServiceImpl.java | 3 ++-
zq-erp/src/main/java/com/matrix/system/app/dto/ShoppingGoodsListDto.java | 11 +++++++++++
zq-erp/src/main/java/com/matrix/system/hive/dao/SysVipInfoDao.java | 2 +-
4 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/app/dto/ShoppingGoodsListDto.java b/zq-erp/src/main/java/com/matrix/system/app/dto/ShoppingGoodsListDto.java
index 62a7172..b83e7a3 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/dto/ShoppingGoodsListDto.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/dto/ShoppingGoodsListDto.java
@@ -32,6 +32,17 @@
@ApiModelProperty(hidden = true)
private Long shopId;
+ @ApiModelProperty(hidden = true)
+ private Long companyId;
+
+ public Long getCompanyId() {
+ return companyId;
+ }
+
+ public void setCompanyId(Long companyId) {
+ this.companyId = companyId;
+ }
+
public String getGoodType() {
return goodType;
}
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/dao/SysVipInfoDao.java b/zq-erp/src/main/java/com/matrix/system/hive/dao/SysVipInfoDao.java
index 88ed684..853b5c5 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/dao/SysVipInfoDao.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/dao/SysVipInfoDao.java
@@ -134,7 +134,7 @@
* @param keyWord
* @return
*/
- public List<SysVipInfo> selectUserByKey(@Param("keyWord") String keyWord);
+ public List<SysVipInfo> selectUserByKey(@Param("keyWord") String keyWord,@Param("companyId") Long companyId);
/**
* 会员活跃状态自动修改
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysVipInfoServiceImpl.java b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysVipInfoServiceImpl.java
index b8c04c6..3fa566e 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysVipInfoServiceImpl.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysVipInfoServiceImpl.java
@@ -293,7 +293,8 @@
@Override
public List<SysVipInfo> findUserByKey(String keyWord) {
- return sysVipInfoDao.selectUserByKey(keyWord);
+ SysUsers user = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
+ return sysVipInfoDao.selectUserByKey(keyWord,user.getCompanyId());
}
diff --git a/zq-erp/src/main/resources/mybatis/mapper/hive/SysVipInfoDao.xml b/zq-erp/src/main/resources/mybatis/mapper/hive/SysVipInfoDao.xml
index b7b723e..328dd6a 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/SysVipInfoDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/SysVipInfoDao.xml
@@ -642,11 +642,11 @@
COMMISSION_ALL,IN_DATE,STAFF_ID,SHOP_ID,IS_DELETE,REMARK,PASSWORD,
EMAIL,CREATE_TIME,UUID,BALANCE,blood,sfCard,link,marry,vocation
from sys_vip_info
- where
- instr(PHONE,#{keyWord})
+ where company_id=#{companyId}
+ and (instr(PHONE,#{keyWord})
or instr(VIP_NAME ,#{keyWord})
or instr(zjm ,#{keyWord})
- or instr(VIP_NO ,#{keyWord})
+ or instr(VIP_NO ,#{keyWord}))
limit 0,15
</select>
--
Gitblit v1.9.1