From b1f0b10302d1f4964305bc4c808cc9a735ddd416 Mon Sep 17 00:00:00 2001
From: "382696293@qq.com" <382696293@qq.com>
Date: Thu, 1 Feb 2024 17:41:40 +0800
Subject: [PATCH] =?UTF-8?q?bug1000356=EF=BC=9A=E6=A0=87=E7=AD=BE=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86-=E5=90=8E=E5=8F=B0=E5=88=9B=E5=BB=BA=E4=BA=86?=
 =?UTF-8?q?=E6=A0=87=E7=AD=BE=EF=BC=8C=E4=BD=86=E4=BC=9A=E5=91=98=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E6=97=A0=E6=B3=95=E9=80=89=E4=B8=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/SysTagMapper.xml    |  2 +-
 flossom-ui/src/views/system/member/index.vue  | 29 ++++++++++++-------
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/flossom-common/flossom-common-core/src/main/resources/mapper/SysTagMapper.xml b/flossom-common/flossom-common-core/src/main/resources/mapper/SysTagMapper.xml
index ca8909e..de60f33 100644
--- a/flossom-common/flossom-common-core/src/main/resources/mapper/SysTagMapper.xml
+++ b/flossom-common/flossom-common-core/src/main/resources/mapper/SysTagMapper.xml
@@ -65,7 +65,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectDeptById" parameterType="Long" resultMap="SysTagResult">
 		<include refid="selectDeptVo"/>
-		where id = #{id}
+		where id = #{id} and del_flag = '0'
 	</select>
 
     <select id="checkDeptExistUser" parameterType="Long" resultType="int">
diff --git a/flossom-ui/src/views/system/member/index.vue b/flossom-ui/src/views/system/member/index.vue
index 6007712..39b0b17 100644
--- a/flossom-ui/src/views/system/member/index.vue
+++ b/flossom-ui/src/views/system/member/index.vue
@@ -1364,7 +1364,6 @@ import {
 	selectUserCount,
 	getMiniProgramTags,
 	getWecomTags,
-	getPurchaseChannel,
 	getRegionByPid,
 	batchAddMiniProgramTag,
 	allAddMiniProgramTag,
@@ -1675,9 +1674,7 @@ export default {
 		this.getTags()
 		// 获取省
 		this.getProvinceList()
-		// 获取标签树
-		this.getDeptTree()
-		this.getScriptTree()
+
 		// 获取仪器列表
 		this.getAllInstrument()
 	},
@@ -1726,10 +1723,6 @@ export default {
 			getWecomTags().then((Response) => {
 				this.wecomTags = Response.data
 			})
-			// 购买渠道
-			getPurchaseChannel().then((Response) => {
-				this.purchaseChannels = Response.data
-			})
 			// 小程序标签树
 			getMiniProgramTagsTree().then((Response) => {
 				this.miniProgramTagTree = Response.data
@@ -2078,12 +2071,14 @@ export default {
 						})
 						return
 					}
-					if (this.batchOperateValue == 1) {
+          if (this.batchOperateValue == 1) {
 						this.title = '添加小程序标签'
 					}
 					if (this.batchOperateValue == 2) {
 						this.title = '删除小程序标签'
 					}
+          // 获取标签树
+          this.getDeptTree()
 					this.batchMiniProgramVisible = true
 				}
 				if (this.batchOperateValue == 3 || this.batchOperateValue == 4) {
@@ -2093,6 +2088,8 @@ export default {
 					if (this.batchOperateValue == 4) {
 						this.title = '删除小程序标签'
 					}
+          // 获取标签树
+          this.getDeptTree()
 					this.batchMiniProgramVisible = true
 				}
 
@@ -2122,10 +2119,12 @@ export default {
 						})
 						return
 					}
+          this.getScriptTree()
 					this.batchScriptVisible = true
 					this.title = '批量发送话术'
 				}
 				if (this.batchOperateValue == 8) {
+          this.getScriptTree()
 					this.batchScriptVisible = true
 					this.title = '全量发送话术'
 				}
@@ -2339,9 +2338,10 @@ export default {
 							this.miniProgramForm.tagIdArray,
 							this.ids
 						).then((Response) => {
-							this.$modal.msgSuccess('批量添加小程序标签成功')
+							this.$modal.msgSuccess('批量添加小程序标签成功');
 							this.cancelMiniProgramDialog(true)
 						})
+            this.getList();
 					}
 				})
 			}
@@ -2356,6 +2356,7 @@ export default {
 							this.$modal.msgSuccess('批量删除小程序标签成功')
 							this.cancelMiniProgramDialog(true)
 						})
+            this.getList();
 					}
 				})
 			}
@@ -2370,6 +2371,7 @@ export default {
 							this.$modal.msgSuccess('全量添加小程序标签成功')
 							this.cancelMiniProgramDialog(true)
 						})
+            this.getList();
 					}
 				})
 			}
@@ -2384,6 +2386,7 @@ export default {
 							this.$modal.msgSuccess('全量删除小程序标签成功')
 							this.cancelMiniProgramDialog(true)
 						})
+            this.getList();
 					}
 				})
 			}
@@ -2396,6 +2399,7 @@ export default {
 							this.$modal.msgSuccess('批量操作积分成功')
 							this.cancelIntegralDialog(true)
 						})
+            this.getList();
 					}
 				})
 			}
@@ -2409,6 +2413,7 @@ export default {
 								this.cancelIntegralDialog(true)
 							}
 						)
+            this.getList();
 					}
 				})
 			}
@@ -2419,12 +2424,14 @@ export default {
 				batchSendScript(this.scriptForm).then((Response) => {
 					this.$modal.msgSuccess('批量发送话术成功')
 					this.cancelScriptDialog(true)
+          this.getList();
 				})
 			}
 			if (this.batchOperateValue == 8) {
 				allSendScript(this.scriptForm, this.queryParams).then((Response) => {
 					this.$modal.msgSuccess('全量发送话术成功')
 					this.cancelScriptDialog(true)
+          this.getList();
 				})
 			}
 
@@ -2436,6 +2443,7 @@ export default {
 						batchAddRemark(this.remarkForm).then((Response) => {
 							this.$modal.msgSuccess('批量备注成功')
 							this.cancelRemarkDialog(true)
+              this.getList();
 						})
 					}
 				})
@@ -2448,6 +2456,7 @@ export default {
 							(Response) => {
 								this.$modal.msgSuccess('批量备注成功')
 								this.cancelRemarkDialog(true)
+                this.getList();
 							}
 						)
 					}