From ed0719d0693c312e8e70d7d85a55643a05ac9a7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E4=B8=96=E5=BC=BA?= Date: Fri, 7 Jul 2023 18:03:51 +0800 Subject: [PATCH] =?UTF-8?q?sql=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/natural/Jg_naturalMapper.xml | 6 ++---- SC-web/src/views/extend/paymentdoc/form.vue | 1 + 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/SC-boot/linkage-scm/src/main/resources/mapper/natural/Jg_naturalMapper.xml b/SC-boot/linkage-scm/src/main/resources/mapper/natural/Jg_naturalMapper.xml index 5491edc3..1aa560f2 100644 --- a/SC-boot/linkage-scm/src/main/resources/mapper/natural/Jg_naturalMapper.xml +++ b/SC-boot/linkage-scm/src/main/resources/mapper/natural/Jg_naturalMapper.xml @@ -30,10 +30,8 @@ IFNULL( SUM( CASE b.unit WHEN 0 THEN b.settlement ELSE b.settlement / 1000 END ), 0 ) naturalSum FROM jg_natural a - LEFT JOIN jg_poundlist b ON a.id = b.natural_id - WHERE - ( a.delete_mark != 1 OR a.delete_mark IS NULL ) - AND ( b.delete_mark != 1 OR b.delete_mark IS NULL ) + LEFT JOIN jg_poundlist b ON a.id = b.natural_id AND b.delete_mark = '0' + WHERE a.delete_mark = '0' GROUP BY a.id) a ${ew.customSqlSegment} diff --git a/SC-web/src/views/extend/paymentdoc/form.vue b/SC-web/src/views/extend/paymentdoc/form.vue index cf8f2a8a..e169d635 100644 --- a/SC-web/src/views/extend/paymentdoc/form.vue +++ b/SC-web/src/views/extend/paymentdoc/form.vue @@ -944,6 +944,7 @@ this.$emit('refresh') }, init(data) { + debugger this.dataForm.id = data.id || ""; this.setting = data; this.visible = true;