Merge remote-tracking branch 'origin/dev' into dev

zt-module-base/zt-module-base-server/src/main/resources/mapper/base/CompanyRelativityMapper.xml

@@ -30,11 +30,17 @@
         left join SPLY_ERP_CPN c on r.ERP_NUM = c.NUM
         where d.DELETED = 0
           and d.IS_COMPANY = 1
+        <if test="erpNumber != null">
+            and c.NUM = #{erpNumber}
+        </if>
+        <if test="number != null">
+            and d.CODE = #{number}
+        </if>
         <if test="name != null">
-            and d.NAME = #{name}
+            and d.NAME like concat('%', #{name}, '%')
         </if>
         <if test="erpName != null">
-            and c.NAME = #{erpName}
+            and c.NAME like concat('%', #{erpName}, '%')
         </if>
         <if test="manager != null">
             and d.LEADER_USER_ID = #{manager}