From 9f7d60024295cacc64bd7fbed2416e99abcfcb37 Mon Sep 17 00:00:00 2001 From: "15881625488@163.com" <15881625488@163.com> Date: Fri, 23 Jan 2026 09:30:26 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A[=E6=A1=A3=E6=A1=88=E7=AE=A1?= =?UTF-8?q?=E7=90=86]=E7=BB=99=E8=8D=AF=E5=88=B6=E5=89=82=EF=BC=8C?= =?UTF-8?q?=E9=BA=BB=E7=B2=BE=E8=8D=AF=EF=BC=8C=E5=8F=91=E6=94=BE=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E6=A1=A3=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/hxhq/business/service/impl/GyzjFfjlServiceImpl.java | 1 + .../main/java/com/hxhq/business/service/impl/MjyFfjlServiceImpl.java | 1 + .../hxhq-system/src/main/resources/mapper/business/GyzjFfjlMapper.xml | 2 +- .../hxhq-system/src/main/resources/mapper/business/MjyFfjlMapper.xml | 2 +- 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjFfjlServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjFfjlServiceImpl.java index ec4b037..fc2ced9 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjFfjlServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjFfjlServiceImpl.java @@ -512,6 +512,7 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i public List queryArchiveList(FfjlSearchForm form){ QueryWrapper queryWrapper = Wrappers.query(); queryWrapper.eq("t.del_flag", "0"); + queryWrapper.eq("t.`dazt`", DaztEnum.ygd.getValue()); if (form.getJyzt() != null && form.getJyzt().intValue() > 0) { queryWrapper.eq("t.jyzt", form.getJyzt()); } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyFfjlServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyFfjlServiceImpl.java index 000c914..c03f099 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyFfjlServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyFfjlServiceImpl.java @@ -509,6 +509,7 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl public List queryArchiveList(FfjlSearchForm form){ QueryWrapper queryWrapper = Wrappers.query(); queryWrapper.eq("t.del_flag", "0"); + queryWrapper.eq("t.`dazt`", DaztEnum.ygd.getValue()); if (form.getJyzt() != null && form.getJyzt().intValue() > 0) { queryWrapper.eq("t.jyzt", form.getJyzt()); } diff --git a/hxhq-modules/hxhq-system/src/main/resources/mapper/business/GyzjFfjlMapper.xml b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/GyzjFfjlMapper.xml index d2a182d..4d9cdc3 100644 --- a/hxhq-modules/hxhq-system/src/main/resources/mapper/business/GyzjFfjlMapper.xml +++ b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/GyzjFfjlMapper.xml @@ -5,7 +5,7 @@ select t.id,t.mc,t.bh,t.ffzytj,t.ffrq,t.ghrq,t.ckl,t.ckldw,t.rkl,t.rkldw,t.ckmz,t.ckmzdw,t.lqr1_mc,t.lqr2_mc,t.ffr1_mc,t.ffr2_mc,t.jsr1_mc,t.jsr2_mc,t.rkmz,t.rkmzdw - ,t.syl,t.syldw,t.jlzt,t.jyzt,t.md_other + ,t.syl,t.syldw,t.jlzt,t.jyzt,t.md_other,t.jyksrq,t.jyjsrq ,z.mc as zcgMc, (select GROUP_CONCAT(s.name) from t_study s where find_in_set(s.id, t.`md_ids`)) as mdMcs FROM `t_mjy_ffjl` t