Merge remote-tracking branch 'origin/master'

rain

2026-01-23 019f3dd14f140a3381aec0bb696e3a84f76c45e4

 drone-service/drone-system/src/main/java/org/sxkj/system/mapper/DeptMapper.xml

@@ -276,6 +276,20 @@
        AND r.code = #{areaCode}
    </select>

    <select id="selectDeptPage" resultType="org.sxkj.system.vo.DeptVO">
        SELECT
            bd.*
        FROM
            blade_dept bd
        WHERE
            bd.is_deleted = 0
        <if test="param2.deptName!=null and param2.deptName!=''">
            and bd.dept_name like concat(concat('%', #{param2.deptName}),'%')
        </if>
        <if test="param2.fullName!=null and param2.fullName!=''">
            and bd.full_name like concat(concat('%', #{param2.fullName}),'%')
        </if>
    </select>


</mapper>