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

amos-boot-system-equip/src/main/resources/mapper/EquipmentManageMapper.xml

@@ -79,6 +79,9 @@
             <if test="bizOrgCode != null and bizOrgCode != ''">
                 AND biz_org_code like CONCAT(#{bizOrgCode},'%')
             </if>
+            <if test="companyCode != null and companyCode != ''">
+                AND biz_org_code ={companyCode}
+            </if>
             <if test="formGroupId != null and formGroupId != '' and formGroupId != '-1'">
                 AND form_group_id = #{formGroupId}
             </if>