bug修改

puhanshu

2022-07-07 ee395e2aa6741aa7ff8bd0781c8f83b8ed9c2c5e

bug修改

 springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/resources/mapper/ComPropertyAlarmMapper.xml

@@ -18,9 +18,11 @@
    </resultMap>

    <select id="selectList" resultType="com.panzhihua.common.model.vos.property.ComPropertyAlarmVO">
        select t.id,t.serial_no,t.type,t.create_time,t1.phone,t1.username as name,t.status,t.solve_id,t.solve_time,t.solve_content,t.community_id,t.solve_url,t3.address as position,t1.longitude,t1.latitude,t2.name as solveName,t4.username as receiveName from com_property_alarm t
        select t.id,t.serial_no,t.type,t.create_time,t1.phone,t1.username as name,t.status,
            t.solve_id,t.solve_time,t.solve_content,t.community_id,t.solve_url,t1.position,
            t1.longitude,t1.latitude,t2.name as solveName,t4.username as receiveName
        from com_property_alarm t
        left join com_property_equipment t1 on t.serial_no = t1.serial_no
        left join com_mng_population_house t3 on t1.village_id=t3.id
        left join sys_user t2 on t.solve_id = user_id
        left join com_property_equipment t4 on t.receive_no = t4.serial_no
        <where>
@@ -35,7 +37,7 @@
                and t.status =#{commonPage.status}
            </if>
            <if test="commonPage.address !=null and commonPage.address !=''">
                and t3.address like concat(#{commonPage.address},'%')
                and t1.position like concat(#{commonPage.address},'%')
            </if>
            <if test="commonPage.username !=null and commonPage.username !=''">
                and t1.username like concat(#{commonPage.username},'%')