Merge remote-tracking branch 'origin/master'

fuliqi

2025-01-20 9e28453dba6ecf93c6c2234ba38def7c41cf12f0

 business/src/main/resources/mapper/PlanMapper.xml

@@ -63,6 +63,7 @@
            pi.invest_type
        FROM t_project_info AS pi
        LEFT JOIN t_plan AS p ON p.project_info_id = pi.id
        LEFT JOIN sys_dept d ON d.dept_id = PI.project_owner_unit
        <where>
            pi.deleted = 0
            <if test="query.projectName!= null and query.projectName!= ''">
@@ -83,6 +84,7 @@
            <if test="query.yearStatus!= null">
                AND p.year_status = #{query.yearStatus}
            </if>
            ${query.params.dataScope}
        </where>
    </select>