| @@ -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 '商场专属时填写'; | |||||
| @@ -25,5 +25,8 @@ public class WxTagsType extends BaseEntity { | |||||
| @io.swagger.annotations.ApiModelProperty(value="标志",name="flag") | @io.swagger.annotations.ApiModelProperty(value="标志",name="flag") | ||||
| private Integer flag; | private Integer flag; | ||||
| @io.swagger.annotations.ApiModelProperty(value="专属商场标签时填写",name="tenantId") | |||||
| private String tenantId; | |||||
| } | } | ||||
| @@ -76,6 +76,7 @@ public class WxTagsServiceImpl implements WxTagsService { | |||||
| WxTagsType type = new WxTagsType(); | WxTagsType type = new WxTagsType(); | ||||
| type.setGroupId(tg.getId()); | type.setGroupId(tg.getId()); | ||||
| type.setTenantId(tenantEntity.getTenantId()); | |||||
| List<WxTagsTypeVo> typeVos = new ArrayList<>(); | List<WxTagsTypeVo> typeVos = new ArrayList<>(); | ||||
| List<WxTagsType> types = wxTagsTypeService.findList(type); | List<WxTagsType> types = wxTagsTypeService.findList(type); | ||||
| for (WxTagsType tt : types) { | for (WxTagsType tt : types) { | ||||
| @@ -7,10 +7,11 @@ | |||||
| <result column="group_id" jdbcType="BIGINT" property="groupId"/> | <result column="group_id" jdbcType="BIGINT" property="groupId"/> | ||||
| <result column="group_name" jdbcType="VARCHAR" property="groupName"/> | <result column="group_name" jdbcType="VARCHAR" property="groupName"/> | ||||
| <result column="flag" jdbcType="INTEGER" property="flag"/> | <result column="flag" jdbcType="INTEGER" property="flag"/> | ||||
| <result column="tenant_id" jdbcType="VARCHAR" property="tenantId"/> | |||||
| </resultMap> | </resultMap> | ||||
| <sql id="allColumns"> | <sql id="allColumns"> | ||||
| `id`,`name`,`group_id`,`group_name`,`flag` | |||||
| `id`,`name`,`group_id`,`group_name`,`flag`,`tenant_id` | |||||
| </sql> | </sql> | ||||
| <sql id="dynamicWhereConditions"> | <sql id="dynamicWhereConditions"> | ||||
| @@ -35,6 +36,10 @@ | |||||
| <if test=" null != flag "> | <if test=" null != flag "> | ||||
| and `flag` = #{flag} | and `flag` = #{flag} | ||||
| </if> | </if> | ||||
| <if test=" null != tenantId "> | |||||
| and (`tenant_id` = #{tenantId} or tenant_id is null or tenant_id = '') | |||||
| </if> | |||||
| <if test=" null != ids "> | <if test=" null != ids "> | ||||