From 3732907055fbbbb91ba3195f737d81c470e129fa Mon Sep 17 00:00:00 2001 From: cun-nan <19819293608@163.com> Date: Fri, 12 Jul 2024 17:13:53 +0800 Subject: [PATCH] bug --- fuintAdmin_zt/src/views/Site/add.vue | 5 +++++ .../src/main/resources/mapper/TSourceMapper.xml | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/fuintAdmin_zt/src/views/Site/add.vue b/fuintAdmin_zt/src/views/Site/add.vue index a5fc9ae4f..a647bf991 100644 --- a/fuintAdmin_zt/src/views/Site/add.vue +++ b/fuintAdmin_zt/src/views/Site/add.vue @@ -160,6 +160,11 @@ export default { }else { this.isCashier = false } + if (this.checkedKeys.length==this.ruleForm.checkedKeys.length && this.isCashier){ + this.checked = true + }else { + this.checked = false + } this.getMenuTreeselect() // this.tableData = response.data.treeselect; }); diff --git a/fuintBackend/fuint-repository/src/main/resources/mapper/TSourceMapper.xml b/fuintBackend/fuint-repository/src/main/resources/mapper/TSourceMapper.xml index e78dd4229..93a56f20d 100644 --- a/fuintBackend/fuint-repository/src/main/resources/mapper/TSourceMapper.xml +++ b/fuintBackend/fuint-repository/src/main/resources/mapper/TSourceMapper.xml @@ -9,7 +9,7 @@ AND source_id IN(SELECT source_id FROM `t_duty_source` WHERE duty_id IN(SELECT duty_id FROM `t_account_duty` - WHERE acct_id = #{accountId})) + WHERE acct_id = #{accountId} and if_delete = '0')) ORDER BY s.source_style ASC