From deb1d7ad611d1ee2113ccad333d67142110b3454 Mon Sep 17 00:00:00 2001
From: hayu <1604366271@qq.com>
Date: Fri, 14 Jun 2024 13:37:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E8=B4=AD=E6=96=B0=E5=A2=9E=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E4=B8=8B=E6=8B=89=E6=A1=86=E5=8E=BB=E9=87=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/base/MaMachineTypeMapper.xml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineTypeMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineTypeMapper.xml
index 786ad5ff..8dc79719 100644
--- a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineTypeMapper.xml
+++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineTypeMapper.xml
@@ -175,21 +175,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <select id="selectMaTypeList" parameterType="String" resultMap="MaTypeResult">
-        select m.type_id, m.type_name, m.parent_id, m.status, m.num, m.unit_id, m.unit_name, m.manage_type,
+        select DISTINCT m.type_id, m.type_name, m.parent_id, m.status, m.num, 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, mtf.file_name photoName, mtf.file_url photoUrl,
                mtf2.file_name documentName, mtf2.file_url documentUrl, mtk.user_id keeperUserId,
                su.nick_name keeperUserName, mpi.prop_name, m.del_flag, m.create_by, m.create_time,
                m.remark, m.company_id ,m.type_id id , m.type_name label
         from ma_type m
-        left join ma_prop_set mps on m.type_id = mps.type_id
-        left join ma_prop_info mpi on mps.prop_id = mpi.prop_id
+        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 * from ma_type_file where file_type = '1') mtf on m.type_id = mtf.type_id
         left join (select * from ma_type_file where file_type = '2') mtf2 on m.type_id = mtf2.type_id
         left join ma_type_keeper mtk on mtf.type_id = mtk.type_id
         left join sys_user su on mtk.user_id = su.user_id
         <where>
             m.status = '0'
+            and m.del_flag = '0'
             <if test="typeName != null and typeName !=''">
                 AND type_name like concat('%',#{typeName},'%')
             </if>