From 22cf285bd2a39a71cdf22654cefa693e35f23d68 Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Wed, 13 Nov 2024 16:23:54 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=86=E6=96=99=E6=8E=A5=E5=8F=A3=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/material/ma/TypeMapper.xml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/TypeMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/TypeMapper.xml index de86cfa0..6f063418 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/TypeMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/TypeMapper.xml @@ -458,7 +458,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select DISTINCT m.type_id, m.type_name, m.parent_id, m.unit_id, m.unit_name, m.manage_type, m.lease_price,m.eff_time, m.rent_price, m.buy_price, m.pay_price, m.level, m.rated_load, m.test_load, m.holding_time, m.warn_num, - mpi.prop_name, m.del_flag, m.create_by, m.create_time, + m.del_flag, m.create_by, m.create_time, m.remark,m.type_id id , m.type_name label, CASE m.manage_type WHEN 0 THEN @@ -467,8 +467,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" IFNULL(m.storage_num, 0) END as storage_num from ma_type m - left join ma_prop_set mps on m.type_id = mps.type_id and mps.`status`='0' and mps.del_flag='0' - left join ma_prop_info mpi on mps.prop_id = mpi.prop_id and mpi.`status`='0' and mpi.del_flag='0' left join (SELECT mt.type_id, mt2.type_name AS typeName, mt.type_name AS typeModelName,