Merge branch 'main' of http://39.101.188.84:8000/suzhou-jichuang-lanhai/Suzhouyingji3Java into zhangtao

ruoyi-system/src/main/resources/mapper/yingji/BPlanEnterpriseMapper.xml

@@ -76,7 +76,7 @@
             <if test="userId != null ">and a.user_id = #{userId}</if>
             <if test="deptId != null ">and a.dept_id = #{deptId}</if>
             <if test="district != null and district != ''">
-                and s.district in
+                and a.district in
                 <foreach item="item" index="index" collection="district.split(',')" open="(" separator="," close=")">
                     #{item}
                 </foreach>