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 e9b90480..79f672e5 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,14 +458,15 @@ 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, - mtk.user_id keeperUserId, - su.nick_name keeperUserName, mpi.prop_name, m.del_flag, m.create_by, m.create_time, + -- mtk.user_id keeperUserId, + -- su.nick_name keeperUserName, + mpi.prop_name, m.del_flag, m.create_by, m.create_time, m.remark,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 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 ma_type_keeper mtk on m.type_id = mtk.type_id - left join sys_user su on mtk.user_id = su.user_id + -- left join ma_type_keeper mtk on m.type_id = mtk.type_id + -- left join sys_user su on mtk.user_id = su.user_id m.del_flag = '0'