Merge remote-tracking branch 'origin/master'

bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmProjectMapper.xml

@@ -94,6 +94,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                bp.pro_code as proCode
         from bm_project bp
         where bp.del_flag = '0'
+        <if test="companyId != null">
+            and bp.company_id=#{companyId}
+        </if>
         <if test="proName != null and proName != ''">
             <if test="proCode != null and proCode != ''">
                 and (bp.pro_name = #{proName} or bp.pro_code = #{proCode})

bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmUnitMapper.xml

@@ -40,6 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectBmUnitByProName" resultType="com.bonus.material.basic.domain.BmUnit">
         select unit_id as unitId, unit_name as unitName from bm_unit where del_flag = 0 and unit_name = #{unitName}
+        <if test="companyId != null"> and company_id =#{companyId}</if>
         <if test="deptId != null">and dept_id = #{deptId}</if>
         <if test="typeId != null">and type_id = #{typeId}</if>
     </select>