Merge remote-tracking branch 'origin/master'

xiangpei

2025-02-11 f5a366b2c3b200006983f3a40872bc4976a884d7

Merge remote-tracking branch 'origin/master'

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

@@ -167,8 +167,7 @@
<!--                    and TPI.used_status != 2-->
<!--                </if>-->
                <if test="query.role == 1">
                    and TPI.used_status = 1 and  FIND_IN_SET(#{query.competentDepartment}, TPI.competent_department) > 0;

                    and TPI.used_status = 1 and  FIND_IN_SET(#{query.competentDepartment}, TPI.competent_department) > 0
                </if>
            </if>
            <!--${query.params.dataScope}-->