From 7fca12a31ffc8692eb725b6bb0dc5b29fd49067f Mon Sep 17 00:00:00 2001 From: elliott <382696293@qq.com> Date: Mon, 22 Jan 2024 16:03:46 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E5=BE=AE=E6=A0=87=E7=AD=BE=E6=9B=B4?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E5=A4=96=E9=83=A8=E6=A0=87=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/core/domain/entity/SiteInfo.java | 20 ++++++++--------- .../common/core/domain/entity/SysTag.java | 2 +- .../common/core/domain/entity/WxModeTag.java | 4 ++-- .../core/domain/entity/WxScriptTemplate.java | 6 ++--- .../core/domain/entity/WxUserScriptLog.java | 2 +- .../domain/export/WxUserMemberExport.java | 2 +- .../core/domain/req/WxUserMemberReq.java | 2 +- .../core/domain/req/WxUserMemberVm.java | 4 ++-- .../core/domain/req/WxUserScriptReq.java | 2 +- .../core/domain/ret/WxUserMemberRet.java | 2 +- .../common/core/domain/vo/WxUserMemberVo.java | 2 +- .../service/impl/SiteInfoServiceImpl.java | 8 +++---- .../system/controller/SysTagController.java | 6 ++--- .../service/impl/SiteInfoServiceImpl.java | 18 +++++++-------- .../service/impl/WxInstrumentServiceImpl.java | 2 +- .../service/impl/WxUserMemberServiceImpl.java | 6 ++--- .../impl/WxUserScriptLogServiceImpl.java | 2 +- flossom-ui/src/api/system/instrument.js | 2 +- .../src/views/system/companyTag/index.vue | 2 +- .../src/views/system/instrument/index.vue | 6 ++--- flossom-ui/src/views/system/member/index.vue | 22 +++++++++---------- flossom-ui/src/views/system/mode/index.vue | 6 ++--- .../src/views/system/scriptTag/index.vue | 10 ++++----- .../views/system/siteCarouselInfo/index.vue | 12 +++++----- .../src/views/system/siteInfo/index.vue | 8 +++---- 25 files changed, 79 insertions(+), 79 deletions(-) diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/SiteInfo.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/SiteInfo.java index aff47fb..dea7ee2 100644 --- a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/SiteInfo.java +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/SiteInfo.java @@ -91,12 +91,12 @@ public class SiteInfo extends BaseEntity @Excel(name = "可见小程序标签ID") private String showWechatTagId; - /** 可见企微标签 */ - @Excel(name = "可见企微标签") + /** 可见外部标签 */ + @Excel(name = "可见外部标签") private String showCompanyTag; private List showCompanyTagArray = new ArrayList(); - /** 可见企微标签ID */ - @Excel(name = "可见企微标签ID") + /** 可见外部标签ID */ + @Excel(name = "可见外部标签ID") private String showCompanyTagId; /** 禁止小程序标签 */ @@ -107,13 +107,13 @@ public class SiteInfo extends BaseEntity @Excel(name = "禁止小程序标签ID") private String forbidWechatTagId; - /** 禁止企微标签 */ - @Excel(name = "禁止企微标签") + /** 禁止外部标签 */ + @Excel(name = "禁止外部标签") private String forbidCompanyTag; private List forbidCompanyTagArray = new ArrayList(); - /** 禁止企微标签ID */ - @Excel(name = "禁止企微标签ID") + /** 禁止外部标签ID */ + @Excel(name = "禁止外部标签ID") private String forbidCompanyTagId; /** 渠道名称 */ @@ -137,8 +137,8 @@ public class SiteInfo extends BaseEntity private String handlerCompanyTagId; private List handlerCompanyTagArray = new ArrayList(); - /** 获取企微标签 */ - @Excel(name = "获取企微标签") + /** 获取外部标签 */ + @Excel(name = "获取外部标签") private String handlerCompanyTag; @Excel(name = "获取小程序标签") diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/SysTag.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/SysTag.java index a9a38c2..90a4336 100644 --- a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/SysTag.java +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/SysTag.java @@ -51,7 +51,7 @@ public class SysTag extends BaseEntity /** 邮箱 */ private String email; - /** 标签状态:1小程序标签,2企微标签 */ + /** 标签状态:1小程序标签,2外部标签 */ @Excel(name = "标签类型") private String type; diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxModeTag.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxModeTag.java index 9dbc1b7..233504f 100644 --- a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxModeTag.java +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxModeTag.java @@ -26,8 +26,8 @@ public class WxModeTag extends BaseEntity @Excel(name = "标签主键") private Long tagId; - /** 标签类型（1小程序标签 2企微标签） */ - @Excel(name = "标签类型", readConverterExp = "1=小程序标签,2=企微标签") + /** 标签类型（1小程序标签 2外部标签） */ + @Excel(name = "标签类型", readConverterExp = "1=小程序标签,2=外部标签") private Long tagType; /** 状态（0正常 1禁用） */ diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxScriptTemplate.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxScriptTemplate.java index 10e19cf..4bd0995 100644 --- a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxScriptTemplate.java +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxScriptTemplate.java @@ -39,7 +39,7 @@ public class WxScriptTemplate extends BaseEntity private String tagNames; /** 标签名字 */ - @Excel(name = "企微标签名字") + @Excel(name = "外部标签名字") private String companyTagNames; /** 标签ID */ @@ -50,8 +50,8 @@ public class WxScriptTemplate extends BaseEntity @Excel(name = "话术等级：1一级 2 二级") private Long level; - /** 1小程序标签 2企微标签 */ - @Excel(name = "1小程序标签 2企微标签") + /** 1小程序标签 2外部标签 */ + @Excel(name = "1小程序标签 2外部标签") private Integer tagType; /** 跳转类型：0无跳转、1跳转内部链接、3跳转外部链接、4跳转小程序、5导向视频号、6导向视频号直播间 */ diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxUserScriptLog.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxUserScriptLog.java index 055a3a5..eff947f 100644 --- a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxUserScriptLog.java +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxUserScriptLog.java @@ -59,7 +59,7 @@ public class WxUserScriptLog extends BaseEntity { private String content; /** - * 标签类型：1小程序标签 2企微标签 + * 标签类型：1小程序标签 2外部标签 */ private Integer tagType; diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/export/WxUserMemberExport.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/export/WxUserMemberExport.java index a2ffc98..5a744e4 100644 --- a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/export/WxUserMemberExport.java +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/export/WxUserMemberExport.java @@ -83,7 +83,7 @@ public class WxUserMemberExport { @Excel(name = "用户注册时间", dateFormat = "yyyy-MM-dd HH:mm:ss") private Date createTime; - @Excel(name = "企微标签") + @Excel(name = "外部标签") String wecomTags; @Excel(name = "小程序标签") diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/req/WxUserMemberReq.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/req/WxUserMemberReq.java index e345890..38966d0 100644 --- a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/req/WxUserMemberReq.java +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/req/WxUserMemberReq.java @@ -52,7 +52,7 @@ public class WxUserMemberReq { private Date birthday; /** - * 企微标签 + * 外部标签 */ List wecomTags; diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/req/WxUserMemberVm.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/req/WxUserMemberVm.java index 4c38f37..0119fd7 100644 --- a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/req/WxUserMemberVm.java +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/req/WxUserMemberVm.java @@ -98,12 +98,12 @@ public class WxUserMemberVm extends BaseEntity { List purchaseChannels; /** - * 企微标签 + * 外部标签 */ List wecomTags; /** - * 企微标签个数 + * 外部标签个数 */ Integer wecomTagNum; diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/req/WxUserScriptReq.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/req/WxUserScriptReq.java index c776723..4b6cca2 100644 --- a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/req/WxUserScriptReq.java +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/req/WxUserScriptReq.java @@ -50,7 +50,7 @@ public class WxUserScriptReq { private String content; /** - * 标签类型：1小程序标签 2企微标签 + * 标签类型：1小程序标签 2外部标签 */ private Integer tagType; diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/ret/WxUserMemberRet.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/ret/WxUserMemberRet.java index 05c4e63..daebb2a 100644 --- a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/ret/WxUserMemberRet.java +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/ret/WxUserMemberRet.java @@ -24,7 +24,7 @@ public class WxUserMemberRet extends WxUserMember { private List miniProgramTags; /** - * 企微标签 + * 外部标签 */ private List wecomTags; diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/vo/WxUserMemberVo.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/vo/WxUserMemberVo.java index d3ced05..e7e5ac6 100644 --- a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/vo/WxUserMemberVo.java +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/vo/WxUserMemberVo.java @@ -156,7 +156,7 @@ public class WxUserMemberVo { private List wxUserRemarkList; /** - * 企微标签 + * 外部标签 */ private List wecomTags; diff --git a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/SiteInfoServiceImpl.java b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/SiteInfoServiceImpl.java index 58ae882..f35e825 100644 --- a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/SiteInfoServiceImpl.java +++ b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/SiteInfoServiceImpl.java @@ -92,7 +92,7 @@ public class SiteInfoServiceImpl implements ISiteInfoService { List userIdList = Arrays.asList(SecurityUtils.getLoginUser().getWxUserMember().getId()).stream().map(Long::intValue).collect(Collectors.toList()); batchAddTag(tagIdList, userIdList, TagTypeStatus.MINI_PROGRAM.getCode()); } - // 企微标签 + // 外部标签 siteInfoTag.setTagType(TagTypeStatus.ENTERPRISE_WECHAT.getCode()); siteInfoTag.setStatus(2L); List addWecomTagList = siteInfoTagMapper.selectSiteInfoTagList(siteInfoTag); @@ -150,7 +150,7 @@ public class SiteInfoServiceImpl implements ISiteInfoService { * @return */ private List filterSite(List siteInfos) { - /* 获取用户拥有的小程序标签和企微标签 */ + /* 获取用户拥有的小程序标签和外部标签 */ List userMiniTageIdList = new ArrayList<>(); List userWecomTageIdList = new ArrayList<>(); WxUserMember wxUserMember = SecurityUtils.getLoginUser().getWxUserMember(); @@ -163,7 +163,7 @@ public class SiteInfoServiceImpl implements ISiteInfoService { userMiniTageIdList = userMiniProgramTags.stream().map(WxUserTag::getTagId).collect(Collectors.toList()); } wxUserTag.setType(TagTypeStatus.ENTERPRISE_WECHAT.getCode()); - // 用户拥有的企微标签 + // 用户拥有的外部标签 List userWecomTags = wxUserTagMapper.selectWxUserTagList(wxUserTag); if (userWecomTags != null && userWecomTags.size() > 0) { userWecomTageIdList = userWecomTags.stream().map(WxUserTag::getTagId).collect(Collectors.toList()); @@ -262,7 +262,7 @@ public class SiteInfoServiceImpl implements ISiteInfoService { continue; } } - // 4.5、可见企微标签 + // 4.5、可见外部标签 siteInfoTag.setSiteId(info.getId()); siteInfoTag.setTagType(TagTypeStatus.ENTERPRISE_WECHAT.getCode()); siteInfoTag.setStatus(0L); diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/SysTagController.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/SysTagController.java index 151c559..13c3d73 100644 --- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/SysTagController.java +++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/SysTagController.java @@ -158,7 +158,7 @@ public class SysTagController extends BaseController { } /** - * 获取企微标签 + * 获取外部标签 * * @return */ @@ -180,14 +180,14 @@ public class SysTagController extends BaseController { if (TagTypeStatus.MINI_PROGRAM.getCode().toString().equals(tag.getType())) { sheetName += "小程序标签数据"+ s ; } else { - sheetName += "企微标签数据"+ s ; + sheetName += "外部标签数据"+ s ; } List list = tagService.selectDeptList(tag); for (SysTag sysTag: list) { if (TagTypeStatus.MINI_PROGRAM.getCode().toString().equals(sysTag.getType())) { sysTag.setType("小程序标签"); } else { - sysTag.setType("企微标签"); + sysTag.setType("外部标签"); } if (0 == sysTag.getParentId()) { sysTag.setParentName(sysTag.getTagName()); diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/SiteInfoServiceImpl.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/SiteInfoServiceImpl.java index 6145910..0176606 100644 --- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/SiteInfoServiceImpl.java +++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/SiteInfoServiceImpl.java @@ -72,7 +72,7 @@ public class SiteInfoServiceImpl implements ISiteInfoService // 查询用的标签关联实体 SiteInfoTag infoTag = new SiteInfoTag(); infoTag.setSiteId(id); - // 处理禁用企微标签数组 + // 处理禁用外部标签数组 if (StringUtils.isNotEmpty(siteInfo.getForbidCompanyTagId())) { // 关联表查询数据 infoTag.setTagType(2); @@ -99,7 +99,7 @@ public class SiteInfoServiceImpl implements ISiteInfoService List showWechatList = siteInfoTags.stream().map(SiteInfoTag::getTagId).collect(Collectors.toList()); siteInfo.setShowWechatTagArray(showWechatList); } - // 处理可见企微标签数组 + // 处理可见外部标签数组 if (StringUtils.isNotEmpty(siteInfo.getShowCompanyTagId())) { // 关联表查询数据 infoTag.setTagType(2); @@ -117,7 +117,7 @@ public class SiteInfoServiceImpl implements ISiteInfoService List handlerWechatList = siteInfoTags.stream().map(SiteInfoTag::getTagId).collect(Collectors.toList()); siteInfo.setHandlerWechatTagArray(handlerWechatList); } - // 处理弹窗活动企微标签 + // 处理弹窗活动外部标签 if (StringUtils.isNotEmpty(siteInfo.getHandlerCompanyTagId())){ // 关联表查询数据 infoTag.setTagType(2); @@ -193,7 +193,7 @@ public class SiteInfoServiceImpl implements ISiteInfoService infoTag.setCreateTime(DateUtils.getNowDate()); siteInfoTagMapper.insertSiteInfoTag(infoTag); } - // 保存可见企微标签关联关系 + // 保存可见外部标签关联关系 for (SysTag tag: showCompanyTagNew) { SiteInfoTag infoTag = new SiteInfoTag(); infoTag.setSiteId(siteInfo.getId()); @@ -215,7 +215,7 @@ public class SiteInfoServiceImpl implements ISiteInfoService infoTag.setCreateTime(DateUtils.getNowDate()); siteInfoTagMapper.insertSiteInfoTag(infoTag); } - // 保存禁用企微标签关联关系 + // 保存禁用外部标签关联关系 for (SysTag tag: forbidCompanyTagNew) { SiteInfoTag infoTag = new SiteInfoTag(); infoTag.setSiteId(siteInfo.getId()); @@ -247,7 +247,7 @@ public class SiteInfoServiceImpl implements ISiteInfoService infoTag.setCreateTime(DateUtils.getNowDate()); siteInfoTagMapper.insertSiteInfoTag(infoTag); } - // 保存获得企微标签关联关系 + // 保存获得外部标签关联关系 for (SysTag tag: handlerCompanyTagNew) { SiteInfoTag infoTag = new SiteInfoTag(); infoTag.setSiteId(siteInfo.getId()); @@ -291,7 +291,7 @@ public class SiteInfoServiceImpl implements ISiteInfoService String ids = StringUtils.join(resultList, ","); siteInfo.setShowWechatTagId(ids); } - // 保存可见企微标签 + // 保存可见外部标签 if (!CollectionUtils.isEmpty(siteInfo.getShowCompanyTagArray())) { List showCompanyTagArray = siteInfo.getShowCompanyTagArray(); for(long tagId : showCompanyTagArray) { @@ -325,7 +325,7 @@ public class SiteInfoServiceImpl implements ISiteInfoService String ids = StringUtils.join(resultList, ","); siteInfo.setForbidWechatTagId(ids); } - // 保存禁用企微标签 + // 保存禁用外部标签 if (!CollectionUtils.isEmpty(siteInfo.getForbidCompanyTagArray())) { List forbidCompanyTagArray = siteInfo.getForbidCompanyTagArray(); for(long tagId : forbidCompanyTagArray) { @@ -343,7 +343,7 @@ public class SiteInfoServiceImpl implements ISiteInfoService siteInfo.setForbidCompanyTagId(ids); } - // 保存获得企微标签 + // 保存获得外部标签 if (!CollectionUtils.isEmpty(siteInfo.getHandlerCompanyTagArray())) { List handlerCompanyTagArray = siteInfo.getHandlerCompanyTagArray(); for(long tagId : handlerCompanyTagArray) { diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxInstrumentServiceImpl.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxInstrumentServiceImpl.java index 3efed1a..5237daf 100644 --- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxInstrumentServiceImpl.java +++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxInstrumentServiceImpl.java @@ -215,7 +215,7 @@ public class WxInstrumentServiceImpl implements IWxInstrumentService { WxInstrument wxInstrument = new WxInstrument(); BeanUtils.copyProperties(wxInstrumentSaveReq, wxInstrument); - // 处理小程序标签和企微标签 + // 处理小程序标签和外部标签 if (wxInstrumentSaveReq.getMiniTagIds() != null) { List tagIdList = Arrays.asList(wxInstrumentSaveReq.getMiniTagIds().split(",")); StringBuilder tagNames = new StringBuilder(); diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxUserMemberServiceImpl.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxUserMemberServiceImpl.java index 9f8c5d4..5122690 100644 --- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxUserMemberServiceImpl.java +++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxUserMemberServiceImpl.java @@ -81,7 +81,7 @@ public class WxUserMemberServiceImpl implements IWxUserMemberService { collect = miniProgramUserTagList.stream().map(WxUserTag::getTagId).collect(Collectors.toList()); } wxUserMemberVo.setMiniProgramTags(collect); - // 查询企微标签 + // 查询外部标签 query.setType(TagTypeStatus.ENTERPRISE_WECHAT.getCode()); List wecomUserTags = wxUserTagMapper.selectWxUserTagList(query); collect = null; @@ -169,7 +169,7 @@ public class WxUserMemberServiceImpl implements IWxUserMemberService { if (wxUserMemberReq.getMiniProgramTags() != null && wxUserMemberReq.getMiniProgramTags().size() > 0) { batchAddMiniProgramTag(wxUserMemberReq.getMiniProgramTags(), userIdList); } - // 添加用户与企微标签关联 + // 添加用户与外部标签关联 if (wxUserMemberReq.getWecomTags() != null && wxUserMemberReq.getWecomTags().size() > 0) { batchAddWecomTag(wxUserMemberReq.getWecomTags(), userIdList); } @@ -226,7 +226,7 @@ public class WxUserMemberServiceImpl implements IWxUserMemberService { } /** - * 批量添加企微标签 + * 批量添加外部标签 * * @param tagIdList * @param userIdList diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxUserScriptLogServiceImpl.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxUserScriptLogServiceImpl.java index 04fc1d1..55d2183 100644 --- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxUserScriptLogServiceImpl.java +++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxUserScriptLogServiceImpl.java @@ -153,7 +153,7 @@ public class WxUserScriptLogServiceImpl implements IWxUserScriptLogService { .map(WxScriptTag::getTagId) .map(Long::intValue) .collect(Collectors.toList()); - // 企微标签集合 + // 外部标签集合 List wecomTagIdList = wxScriptTagList.stream() .filter(scriptTag -> TagTypeStatus.ENTERPRISE_WECHAT.getCode().equals(scriptTag.getTagType())) .map(WxScriptTag::getTagId) diff --git a/flossom-ui/src/api/system/instrument.js b/flossom-ui/src/api/system/instrument.js index e070ed7..c4024c0 100644 --- a/flossom-ui/src/api/system/instrument.js +++ b/flossom-ui/src/api/system/instrument.js @@ -54,7 +54,7 @@ export function getMiniProgramTagTree() { }) } -/* 获取企微标签树 */ +/* 获取外部标签树 */ export function getWecomTagTree() { return request({ url: '/system/tagInfo/tagTree', diff --git a/flossom-ui/src/views/system/companyTag/index.vue b/flossom-ui/src/views/system/companyTag/index.vue index b587e87..6def551 100644 --- a/flossom-ui/src/views/system/companyTag/index.vue +++ b/flossom-ui/src/views/system/companyTag/index.vue @@ -345,7 +345,7 @@ export default { handleExport() { this.download('system/tagInfo/export', { ...this.queryParams - }, `企微标签数据_${new Date().getTime()}.xlsx`) + }, `外部标签数据_${new Date().getTime()}.xlsx`) } } }; diff --git a/flossom-ui/src/views/system/instrument/index.vue b/flossom-ui/src/views/system/instrument/index.vue index 9394bea..28da47d 100644 --- a/flossom-ui/src/views/system/instrument/index.vue +++ b/flossom-ui/src/views/system/instrument/index.vue @@ -143,7 +143,7 @@ { this.wecomTag.optionTree = response.data this.wecomTag.visible = true @@ -1718,7 +1718,7 @@ export default { this.getList() }) }, - /* 保存企微标签 */ + /* 保存外部标签 */ submitWecomTagList() { this.form.id = this.wecomTag.userId this.form.wecomTagIds = this.wecomTag.selectTagList.join(',') diff --git a/flossom-ui/src/views/system/member/index.vue b/flossom-ui/src/views/system/member/index.vue index a57c0b6..ccdcf2d 100644 --- a/flossom-ui/src/views/system/member/index.vue +++ b/flossom-ui/src/views/system/member/index.vue @@ -139,8 +139,8 @@ - + content="外部标签和小程序标签，同时满足所选内容"> + + content="外部标签和小程序标签，同时满足所选内容"> - + - +