diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxScriptTagMapper.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxScriptTagMapper.java index 21fd827..0e73000 100644 --- a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxScriptTagMapper.java +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxScriptTagMapper.java @@ -67,4 +67,12 @@ public interface WxScriptTagMapper * @return 结果 */ public int deleteWxScriptByScriptId(Long scriptId); + + /** + * 根据标签ID删除关联数据 + * + * @param tagId 需要删除的标签ID + * @return 结果 + */ + public int deleteWxScriptTagByTagId(Long tagId); } diff --git a/flossom-common/flossom-common-core/src/main/resources/mapper/WxScriptTagMapper.xml b/flossom-common/flossom-common-core/src/main/resources/mapper/WxScriptTagMapper.xml index 85a4d00..44da7b3 100644 --- a/flossom-common/flossom-common-core/src/main/resources/mapper/WxScriptTagMapper.xml +++ b/flossom-common/flossom-common-core/src/main/resources/mapper/WxScriptTagMapper.xml @@ -87,4 +87,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{id} + + + delete from wx_script_tag where id = #{tagId} + 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 be24934..ede1dc4 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 @@ -15,6 +15,7 @@ import com.flossom.common.security.annotation.RequiresPermissions; import com.flossom.common.security.utils.SecurityUtils; import com.flossom.system.service.ISysDeptService; import com.flossom.system.service.ISysTagService; +import com.flossom.system.service.IWxScriptTagService; import com.flossom.system.service.IWxUserTagService; import org.apache.commons.lang3.ArrayUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -36,7 +37,8 @@ public class SysTagController extends BaseController { private ISysTagService tagService; @Autowired private IWxUserTagService wxUserTagService; - + @Autowired + private IWxScriptTagService wxScriptTagService; /** * 获取标签列表 */ @@ -112,7 +114,10 @@ public class SysTagController extends BaseController { if (tagService.hasChildByDeptId(id)) { return warn("存在下级标签,不允许删除"); } + // 删除用户标签 wxUserTagService.deleteWxUserTagByTagId(id); + // 删除话术关联标签 + wxScriptTagService.deleteWxScriptTagByTagId(id); // 删除用户标签 // if (tagService.checkDeptExistUser(id)) // { diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/IWxScriptTagService.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/IWxScriptTagService.java new file mode 100644 index 0000000..3a76055 --- /dev/null +++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/IWxScriptTagService.java @@ -0,0 +1,71 @@ +package com.flossom.system.service; + +import com.flossom.common.core.domain.entity.WxScriptTag; + +import java.util.List; + +/** + * 话术模板与标签关联Service接口 + * + * @author flossom + * @date 2024-01-05 + */ +public interface IWxScriptTagService +{ + /** + * 查询话术模板与标签关联 + * + * @param id 话术模板与标签关联主键 + * @return 话术模板与标签关联 + */ + public WxScriptTag selectWxScriptTagById(Long id); + + /** + * 查询话术模板与标签关联列表 + * + * @param wxScriptTag 话术模板与标签关联 + * @return 话术模板与标签关联集合 + */ + public List selectWxScriptTagList(WxScriptTag wxScriptTag); + + /** + * 新增话术模板与标签关联 + * + * @param wxScriptTag 话术模板与标签关联 + * @return 结果 + */ + public int insertWxScriptTag(WxScriptTag wxScriptTag); + + /** + * 修改话术模板与标签关联 + * + * @param wxScriptTag 话术模板与标签关联 + * @return 结果 + */ + public int updateWxScriptTag(WxScriptTag wxScriptTag); + + /** + * 批量删除话术模板与标签关联 + * + * @param ids 需要删除的话术模板与标签关联主键集合 + * @return 结果 + */ + public int deleteWxScriptTagByIds(Long[] ids); + + /** + * 删除话术模板与标签关联信息 + * + * @param id 话术模板与标签关联主键 + * @return 结果 + */ + public int deleteWxScriptTagById(Long id); + + /** + * 删除话术模板与标签关联信息 + * + * @param tagId 标签ID + * @return 结果 + */ + public int deleteWxScriptTagByTagId(Long tagId); + +} diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxScriptTagServiceImpl.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxScriptTagServiceImpl.java new file mode 100644 index 0000000..838a343 --- /dev/null +++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxScriptTagServiceImpl.java @@ -0,0 +1,102 @@ +package com.flossom.system.service.impl; + +import java.util.List; + +import com.flossom.common.core.domain.entity.WxScriptTag; +import com.flossom.common.core.mapper.WxScriptTagMapper; +import com.flossom.common.core.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.flossom.system.service.IWxScriptTagService; + +/** + * 话术模板与标签关联Service业务层处理 + * + * @author flossom + * @date 2024-01-05 + */ +@Service +public class WxScriptTagServiceImpl implements IWxScriptTagService +{ + @Autowired + private WxScriptTagMapper wxScriptTagMapper; + + /** + * 查询话术模板与标签关联 + * + * @param id 话术模板与标签关联主键 + * @return 话术模板与标签关联 + */ + @Override + public WxScriptTag selectWxScriptTagById(Long id) + { + return wxScriptTagMapper.selectWxScriptTagById(id); + } + + /** + * 查询话术模板与标签关联列表 + * + * @param wxScriptTag 话术模板与标签关联 + * @return 话术模板与标签关联 + */ + @Override + public List selectWxScriptTagList(WxScriptTag wxScriptTag) + { + return wxScriptTagMapper.selectWxScriptTagList(wxScriptTag); + } + + /** + * 新增话术模板与标签关联 + * + * @param wxScriptTag 话术模板与标签关联 + * @return 结果 + */ + @Override + public int insertWxScriptTag(WxScriptTag wxScriptTag) + { + wxScriptTag.setCreateTime(DateUtils.getNowDate()); + return wxScriptTagMapper.insertWxScriptTag(wxScriptTag); + } + + /** + * 修改话术模板与标签关联 + * + * @param wxScriptTag 话术模板与标签关联 + * @return 结果 + */ + @Override + public int updateWxScriptTag(WxScriptTag wxScriptTag) + { + wxScriptTag.setUpdateTime(DateUtils.getNowDate()); + return wxScriptTagMapper.updateWxScriptTag(wxScriptTag); + } + + /** + * 批量删除话术模板与标签关联 + * + * @param ids 需要删除的话术模板与标签关联主键 + * @return 结果 + */ + @Override + public int deleteWxScriptTagByIds(Long[] ids) + { + return wxScriptTagMapper.deleteWxScriptTagByIds(ids); + } + + /** + * 删除话术模板与标签关联信息 + * + * @param id 话术模板与标签关联主键 + * @return 结果 + */ + @Override + public int deleteWxScriptTagById(Long id) + { + return wxScriptTagMapper.deleteWxScriptTagById(id); + } + + @Override + public int deleteWxScriptTagByTagId(Long tagId) { + return wxScriptTagMapper.deleteWxScriptTagByTagId(tagId); + } +} diff --git a/flossom-ui/src/views/system/wechatTag/index.vue b/flossom-ui/src/views/system/wechatTag/index.vue index f184805..affc144 100644 --- a/flossom-ui/src/views/system/wechatTag/index.vue +++ b/flossom-ui/src/views/system/wechatTag/index.vue @@ -109,7 +109,7 @@ - + @@ -147,6 +147,8 @@ export default { components: { Treeselect }, data() { return { + // 是否展示上级 + showParent: "", // 遮罩层 loading: true, // 显示搜索条件 @@ -255,10 +257,11 @@ export default { this.reset(); if (row != undefined) { this.form.parentId = row.id; + this.showParent = row.parentId; } this.open = true; this.title = "添加标签"; - listDept().then(response => { + listDept({ type: 1}).then(response => { this.deptOptions = this.handleTree(response.data, "id"); }); },