From 1fb9915a38fbb552ff40432018f052f83619af6e Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Sun, 22 Aug 2021 00:09:58 +0800 Subject: [PATCH] fix tags --- .../resources/db/migration/V202109010002__tag_tenantId.sql | 4 +++- .../src/main/java/com/iformall/domain/po/WxTagsType.java | 3 +++ .../java/com/iformall/service/impl/WxTagsServiceImpl.java | 1 + .../src/main/resources/mapper/WxTagsTypeMapper.xml | 7 ++++++- 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/mallinkAdmin/src/main/resources/db/migration/V202109010002__tag_tenantId.sql b/mallinkAdmin/src/main/resources/db/migration/V202109010002__tag_tenantId.sql index c39d5b143..331e95e04 100644 --- a/mallinkAdmin/src/main/resources/db/migration/V202109010002__tag_tenantId.sql +++ b/mallinkAdmin/src/main/resources/db/migration/V202109010002__tag_tenantId.sql @@ -1 +1,3 @@ -ALTER TABLE wx_tags ADD COLUMN tenant_id VARCHAR(5) COMMENT '商场专属时填写'; \ No newline at end of file +ALTER TABLE wx_tags ADD COLUMN tenant_id VARCHAR(5) COMMENT '商场专属时填写'; + +ALTER TABLE wx_tags_type ADD COLUMN tenant_id VARCHAR(5) COMMENT '商场专属时填写'; \ No newline at end of file diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxTagsType.java b/mallinkService/src/main/java/com/iformall/domain/po/WxTagsType.java index 670e1038e..4e2d8b570 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxTagsType.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxTagsType.java @@ -25,5 +25,8 @@ public class WxTagsType extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value="标志",name="flag") private Integer flag; + + @io.swagger.annotations.ApiModelProperty(value="专属商场标签时填写",name="tenantId") + private String tenantId; } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxTagsServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxTagsServiceImpl.java index 71a5ccf17..a55bcb473 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxTagsServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxTagsServiceImpl.java @@ -76,6 +76,7 @@ public class WxTagsServiceImpl implements WxTagsService { WxTagsType type = new WxTagsType(); type.setGroupId(tg.getId()); + type.setTenantId(tenantEntity.getTenantId()); List typeVos = new ArrayList<>(); List types = wxTagsTypeService.findList(type); for (WxTagsType tt : types) { diff --git a/mallinkService/src/main/resources/mapper/WxTagsTypeMapper.xml b/mallinkService/src/main/resources/mapper/WxTagsTypeMapper.xml index 8de9612bb..b3ea77789 100644 --- a/mallinkService/src/main/resources/mapper/WxTagsTypeMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxTagsTypeMapper.xml @@ -7,10 +7,11 @@ + - `id`,`name`,`group_id`,`group_name`,`flag` + `id`,`name`,`group_id`,`group_name`,`flag`,`tenant_id` @@ -35,6 +36,10 @@ and `flag` = #{flag} + + + and (`tenant_id` = #{tenantId} or tenant_id is null or tenant_id = '') +