Browse Source

fix tags

release_toaliyun_real
xiaohanzi 4 years ago
parent
commit
1fb9915a38
4 changed files with 13 additions and 2 deletions
  1. +3
    -1
      mallinkAdmin/src/main/resources/db/migration/V202109010002__tag_tenantId.sql
  2. +3
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxTagsType.java
  3. +1
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxTagsServiceImpl.java
  4. +6
    -1
      mallinkService/src/main/resources/mapper/WxTagsTypeMapper.xml

+ 3
- 1
mallinkAdmin/src/main/resources/db/migration/V202109010002__tag_tenantId.sql View File

@@ -1 +1,3 @@
ALTER TABLE wx_tags ADD COLUMN tenant_id VARCHAR(5) COMMENT '商场专属时填写';
ALTER TABLE wx_tags ADD COLUMN tenant_id VARCHAR(5) COMMENT '商场专属时填写';

ALTER TABLE wx_tags_type ADD COLUMN tenant_id VARCHAR(5) COMMENT '商场专属时填写';

+ 3
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxTagsType.java View File

@@ -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;

}

+ 1
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxTagsServiceImpl.java View File

@@ -76,6 +76,7 @@ public class WxTagsServiceImpl implements WxTagsService {

WxTagsType type = new WxTagsType();
type.setGroupId(tg.getId());
type.setTenantId(tenantEntity.getTenantId());
List<WxTagsTypeVo> typeVos = new ArrayList<>();
List<WxTagsType> types = wxTagsTypeService.findList(type);
for (WxTagsType tt : types) {


+ 6
- 1
mallinkService/src/main/resources/mapper/WxTagsTypeMapper.xml View File

@@ -7,10 +7,11 @@
<result column="group_id" jdbcType="BIGINT" property="groupId"/>
<result column="group_name" jdbcType="VARCHAR" property="groupName"/>
<result column="flag" jdbcType="INTEGER" property="flag"/>
<result column="tenant_id" jdbcType="VARCHAR" property="tenantId"/>
</resultMap>

<sql id="allColumns">
`id`,`name`,`group_id`,`group_name`,`flag`
`id`,`name`,`group_id`,`group_name`,`flag`,`tenant_id`
</sql>

<sql id="dynamicWhereConditions">
@@ -35,6 +36,10 @@
<if test=" null != flag ">
and `flag` = #{flag}
</if>
<if test=" null != tenantId ">
and (`tenant_id` = #{tenantId} or tenant_id is null or tenant_id = '')
</if>


<if test=" null != ids ">


Loading…
Cancel
Save