吉安感知网项目-后端
blame | history | patch | commit | commitdiff | ignore whitespace
linwei
2 days ago 8585b431e9257333413358eb37c30ae58f74db76 
 drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceScrapMapper.xml


@@ -41,7 +41,7 @@


            <include refid="deviceFields"/>,a.*


        from


        ja_fw_device_scrap a


        left join ja_fw_device b on (a.device_id = b.id)


        left join ja_fw_device b on (a.device_id::VARCHAR = b.id::VARCHAR)


        <where>


            a.is_deleted = 0


            <if test="id != null and id != ''">


@@ -56,7 +56,7 @@


            <include refid="deviceFields"/>,a.*


        from


        ja_fw_device_scrap a


        left join ja_fw_device b on (a.device_id = b.id)


        left join ja_fw_device b on (a.device_id::VARCHAR = b.id::VARCHAR)


        <where>


            a.is_deleted = 0


            <if test="param2.deviceId != null and param2.deviceId != ''">


@@ -71,6 +71,12 @@


            <if test="param2.belongDept != null and param2.belongDept != ''">


                and belong_dept = #{param2.belongDept}


            </if>


            <if test="param2.deptList != null and param2.deptList.size > 0">


                and a.create_dept in


                <foreach collection="param2.deptList" item="deptId" open="(" separator="," close=")">


                    #{deptId}


                </foreach>


            </if>


        </where>


    </select>