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

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

@@ -76,14 +76,14 @@
             <if test="enterpriseName != null  and enterpriseName != ''">and s.enterprise_name like concat('%',
                 #{enterpriseName}, '%')
             </if>
-            <if test="district != '' and district.length==3">
-                and s.district like concat('%',#{district}, '%')
+            <if test="district != null and district.length==3">
+                and a.district like concat('%',#{district}, '%')
             </if>
-            <if test="district != '' and district.length==6">
-                and s.district like concat('%',#{district}, '%')
+            <if test="district != null and district.length==6">
+                and a.district like concat('%',#{district}, '%')
             </if>
-            <if test="district != null and district != ''">
-                and s.district in
+            <if test="district != null and district != '' and district.length!=3 and district.length!=6">
+                and a.district in
                 <foreach item="item" index="index" collection="district.split(',')" open="(" separator="," close=")">
                     #{item}
                 </foreach>

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

@@ -76,13 +76,13 @@
             <if test="updateId != null ">and a.update_id = #{updateId}</if>
             <if test="userId != null ">and a.user_id = #{userId}</if>
             <if test="deptId != null ">and a.dept_id = #{deptId}</if>
-            <if test="district != '' and district.length==3">
+            <if test="district != null and district.length==3">
                 and a.district like concat('%',#{district}, '%')
             </if>
-            <if test="district != '' and district.length==6">
+            <if test="district != null and district.length==6">
                 and a.district like concat('%',#{district}, '%')
             </if>
-            <if test="district != null and district != ''">
+            <if test="district != null and district != '' and district.length!=3 and district.length!=6">
                 and a.district in
                 <foreach item="item" index="index" collection="district.split(',')" open="(" separator="," close=")">
                     #{item}